diff options
73 files changed, 2563 insertions, 770 deletions
@@ -10,7 +10,7 @@ endif default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po -all headers library clean veryclean binary program doc manpages test update-po startup dirs: +all headers library clean veryclean binary program doc manpages debiandoc test update-po startup dirs: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ @@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc manpages test update-po s $(MAKE) -C po $@ $(MAKE) -C test $@ -all headers library clean veryclean binary program doc manpages test update-po: startup dirs +all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs dirs: startup diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index fb444208c..35f95fe22 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -9,10 +9,12 @@ #include <apt-pkg/cachefilter.h> #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/strutl.h> #include <string> #include <regex.h> +#include <fnmatch.h> #include <apti18n.h> /*}}}*/ @@ -52,5 +54,54 @@ PackageNameMatchesRegEx::~PackageNameMatchesRegEx() { /*{{{*/ delete pattern; } /*}}}*/ + +// CompleteArch to <kernel>-<cpu> tuple /*{{{*/ +//---------------------------------------------------------------------- +/* The complete architecture, consisting of <kernel>-<cpu>. */ +static std::string CompleteArch(std::string const &arch) { + if (arch.find('-') != std::string::npos) { + // ensure that only -any- is replaced and not something like company- + std::string complete = std::string("-").append(arch).append("-"); + complete = SubstVar(complete, "-any-", "-*-"); + complete = complete.substr(1, complete.size()-2); + return complete; + } + else if (arch == "armel") return "linux-arm"; + else if (arch == "armhf") return "linux-arm"; + else if (arch == "lpia") return "linux-i386"; + else if (arch == "powerpcspe") return "linux-powerpc"; + else if (arch == "uclibc-linux-armel") return "linux-arm"; + else if (arch == "uclinux-armel") return "uclinux-arm"; + else if (arch == "any") return "*-*"; + else return "linux-" + arch; +} + /*}}}*/ +PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern) :/*{{{*/ + literal(pattern), isPattern(isPattern), d(NULL) { + complete = CompleteArch(pattern); +} + /*}}}*/ +bool PackageArchitectureMatchesSpecification::operator() (char const * const &arch) {/*{{{*/ + if (strcmp(literal.c_str(), arch) == 0 || + strcmp(complete.c_str(), arch) == 0) + return true; + std::string const pkgarch = CompleteArch(arch); + if (isPattern == true) + return fnmatch(complete.c_str(), pkgarch.c_str(), 0) == 0; + return fnmatch(pkgarch.c_str(), complete.c_str(), 0) == 0; +} + /*}}}*/ +bool PackageArchitectureMatchesSpecification::operator() (pkgCache::PkgIterator const &Pkg) {/*{{{*/ + return (*this)(Pkg.Arch()); +} + /*}}}*/ +bool PackageArchitectureMatchesSpecification::operator() (pkgCache::VerIterator const &Ver) {/*{{{*/ + return (*this)(Ver.ParentPkg()); +} + /*}}}*/ +PackageArchitectureMatchesSpecification::~PackageArchitectureMatchesSpecification() { /*{{{*/ +} + /*}}}*/ + } } diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 5d426008b..25cd43f47 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -26,6 +26,36 @@ public: ~PackageNameMatchesRegEx(); }; /*}}}*/ +// PackageArchitectureMatchesSpecification /*{{{*/ +/** \class PackageArchitectureMatchesSpecification + \brief matching against architecture specification strings + + The strings are of the format <kernel>-<cpu> where either component, + or the whole string, can be the wildcard "any" as defined in + debian-policy §11.1 "Architecture specification strings". + + Examples: i386, mipsel, linux-any, any-amd64, any */ +class PackageArchitectureMatchesSpecification { + std::string literal; + std::string complete; + bool isPattern; + /** \brief dpointer placeholder (for later in case we need it) */ + void *d; +public: + /** \brief matching against architecture specification strings + * + * @param pattern is the architecture specification string + * @param isPattern defines if the given \b pattern is a + * architecture specification pattern to match others against + * or if it is the fixed string and matched against patterns + */ + PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); + bool operator() (char const * const &arch); + bool operator() (pkgCache::PkgIterator const &Pkg); + bool operator() (pkgCache::VerIterator const &Ver); + ~PackageArchitectureMatchesSpecification(); +}; + /*}}}*/ } } #endif diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index e2dbe0e57..784d1f0bf 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -182,15 +182,61 @@ pkgCache::PkgIterator PackageContainerInterface::FromName(pkgCacheFile &Cache, return Pkg; } /*}}}*/ +// FromGroup - Returns the package defined by this string /*{{{*/ +bool PackageContainerInterface::FromGroup(PackageContainerInterface * const pci, pkgCacheFile &Cache, + std::string pkg, CacheSetHelper &helper) { + if (unlikely(Cache.GetPkgCache() == 0)) + return false; + + size_t const archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) { + if (arch.empty() == true) { + pkgCache::PkgIterator Pkg = Grp.FindPreferredPkg(); + if (Pkg.end() == false) + { + pci->insert(Pkg); + return true; + } + } else { + bool found = false; + // for 'linux-any' return the first package matching, for 'linux-*' return all matches + bool const isGlobal = arch.find('*') != std::string::npos; + APT::CacheFilter::PackageArchitectureMatchesSpecification pams(arch); + for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg)) { + if (pams(Pkg) == false) + continue; + pci->insert(Pkg); + found = true; + if (isGlobal == false) + break; + } + if (found == true) + return true; + } + } + + pkgCache::PkgIterator Pkg = helper.canNotFindPkgName(Cache, pkg); + if (Pkg.end() == true) + return false; + + pci->insert(Pkg); + return true; +} + /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { bool found = true; _error->PushToStack(); - pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); - if (Pkg.end() == false) - pci->insert(Pkg); - else if (FromTask(pci, Cache, str, helper) == false && + if (FromGroup(pci, Cache, str, helper) == false && + FromTask(pci, Cache, str, helper) == false && FromRegEx(pci, Cache, str, helper) == false) { helper.canNotFindPackage(pci, Cache, str); diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 5b9900603..2a45910ba 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -139,6 +139,7 @@ public: static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static bool FromRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper); + static bool FromGroup(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static bool FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper); static bool FromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 2d12b6fe9..593bb063b 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -83,7 +83,7 @@ bool MMap::Map(FileFd &Fd) { if ((Flags & ReadOnly) != ReadOnly) return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str()); - Base = new unsigned char[iSize]; + Base = malloc(iSize); SyncToFd = new FileFd(); if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false) return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str()); @@ -91,17 +91,17 @@ bool MMap::Map(FileFd &Fd) } // Map it. - Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0); + Base = (Flags & Fallback) ? MAP_FAILED : mmap(0,iSize,Prot,Map,Fd.Fd(),0); if (Base == (void *)-1) { - if (errno == ENODEV || errno == EINVAL) + if (errno == ENODEV || errno == EINVAL || (Flags & Fallback)) { // The filesystem doesn't support this particular kind of mmap. // So we allocate a buffer and read the whole file into it. if ((Flags & ReadOnly) == ReadOnly) { // for readonly, we don't need sync, so make it simple - Base = new unsigned char[iSize]; + Base = malloc(iSize); return Fd.Read(Base, iSize); } // FIXME: Writing to compressed fd's ? @@ -109,7 +109,7 @@ bool MMap::Map(FileFd &Fd) if (dupped_fd == -1) return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd()); - Base = new unsigned char[iSize]; + Base = calloc(iSize, 1); SyncToFd = new FileFd (dupped_fd); if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize)) return false; @@ -135,7 +135,7 @@ bool MMap::Close(bool DoSync) if (SyncToFd != NULL) { - delete[] (char *)Base; + free(Base); delete SyncToFd; SyncToFd = NULL; } @@ -283,8 +283,7 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace, } #endif // fallback to a static allocated space - Base = new unsigned char[WorkSpace]; - memset(Base,0,WorkSpace); + Base = calloc(WorkSpace, 1); iSize = 0; } /*}}}*/ @@ -300,7 +299,7 @@ DynamicMMap::~DynamicMMap() #ifdef _POSIX_MAPPED_FILES munmap(Base, WorkSpace); #else - delete [] (unsigned char *)Base; + free(Base); #endif return; } @@ -464,6 +463,9 @@ bool DynamicMMap::Grow() { Base = realloc(Base, newSize); if (Base == NULL) return false; + else + /* Set new memory to 0 */ + memset((char*)Base + WorkSpace, 0, newSize - WorkSpace); } Pools =(Pool*) Base + poolOffset; diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 76c740341..de645bb6e 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -602,7 +602,8 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const pkgCache::PkgFileIterator CFile = Gen.GetCurFile(); CFile->Size = Pkg.FileSize(); CFile->mtime = Pkg.ModificationTime(); - CFile->Archive = Gen.WriteUniqString("now"); + map_ptrloc const storage = Gen.WriteUniqString("now"); + CFile->Archive = storage; if (Gen.MergeList(Parser) == false) return _error->Error("Problem with MergeList %s",File.c_str()); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 4948c9be4..e93e51af3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -15,6 +15,7 @@ #include <apt-pkg/deblistparser.h> #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/cachefilter.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> @@ -22,7 +23,6 @@ #include <apt-pkg/md5.h> #include <apt-pkg/macros.h> -#include <fnmatch.h> #include <ctype.h> /*}}}*/ @@ -464,22 +464,6 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) } return I; } - -/* - * CompleteArch: - * - * The complete architecture, consisting of <kernel>-<cpu>. - */ -static string CompleteArch(std::string const &arch) { - if (arch == "armel") return "linux-arm"; - if (arch == "armhf") return "linux-arm"; - if (arch == "lpia") return "linux-i386"; - if (arch == "powerpcspe") return "linux-powerpc"; - if (arch == "uclibc-linux-armel") return "linux-arm"; - if (arch == "uclinux-armel") return "uclinux-arm"; - - return (arch.find("-") != string::npos) ? arch : "linux-" + arch; -} /*}}}*/ // ListParser::ParseDepends - Parse a dependency element /*{{{*/ // --------------------------------------------------------------------- @@ -556,58 +540,59 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, if (ParseArchFlags == true) { - string completeArch = CompleteArch(arch); + APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false); // Parse an architecture if (I != Stop && *I == '[') { + ++I; // malformed - I++; - if (I == Stop) - return 0; - - const char *End = I; - bool Found = false; - bool NegArch = false; - while (I != Stop) + if (unlikely(I == Stop)) + return 0; + + const char *End = I; + bool Found = false; + bool NegArch = false; + while (I != Stop) { - // look for whitespace or ending ']' - while (End != Stop && !isspace(*End) && *End != ']') - End++; - - if (End == Stop) + // look for whitespace or ending ']' + for (;End != Stop && !isspace(*End) && *End != ']'; ++End); + + if (unlikely(End == Stop)) return 0; if (*I == '!') - { + { NegArch = true; - I++; - } + ++I; + } - if (stringcmp(arch,I,End) == 0) { + std::string arch(I, End); + if (arch.empty() == false && matchesArch(arch.c_str()) == true) + { Found = true; - } else { - std::string wildcard = SubstVar(string(I, End), "any", "*"); - if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0) - Found = true; + if (I[-1] != '!') + NegArch = false; + // we found a match, so fast-forward to the end of the wildcards + for (; End != Stop && *End != ']'; ++End); } - + if (*End++ == ']') { I = End; break; } - + I = End; for (;I != Stop && isspace(*I) != 0; I++); - } + } - if (NegArch) + if (NegArch == true) Found = !Found; - - if (Found == false) + + if (Found == false) Package = ""; /* not for this arch */ } - + // Skip whitespace for (;I != Stop && isspace(*I) != 0; I++); } @@ -797,7 +782,8 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, { // apt-secure does no longer download individual (per-section) Release // file. to provide Component pinning we use the section name now - FileI->Component = WriteUniqString(component); + map_ptrloc const storage = WriteUniqString(component); + FileI->Component = storage; // FIXME: Code depends on the fact that Release files aren't compressed FILE* release = fdopen(dup(File.Fd()), "r"); @@ -884,13 +870,14 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, break; *s = '\0'; } + map_ptrloc const storage = WriteUniqString(data); switch (writeTo) { - case Suite: FileI->Archive = WriteUniqString(data); break; - case Component: FileI->Component = WriteUniqString(data); break; - case Version: FileI->Version = WriteUniqString(data); break; - case Origin: FileI->Origin = WriteUniqString(data); break; - case Codename: FileI->Codename = WriteUniqString(data); break; - case Label: FileI->Label = WriteUniqString(data); break; + case Suite: FileI->Archive = storage; break; + case Component: FileI->Component = storage; break; + case Version: FileI->Version = storage; break; + case Origin: FileI->Origin = storage; break; + case Codename: FileI->Codename = storage; break; + case Label: FileI->Label = storage; break; case None: break; } } diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 482581979..98ce4497a 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -51,7 +51,8 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const pkgCache::PkgFileIterator CFile = Gen.GetCurFile(); CFile->Size = Pkg.FileSize(); CFile->mtime = Pkg.ModificationTime(); - CFile->Archive = Gen.WriteUniqString("edsp::scenario"); + map_ptrloc const storage = Gen.WriteUniqString("edsp::scenario"); + CFile->Archive = storage; if (Gen.MergeList(Parser) == false) return _error->Error("Problem with MergeList %s",File.c_str()); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index f694a237e..9acb7da72 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -970,7 +970,7 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const { pkgCache::PkgIterator const Owner = OwnerPkg(); pkgCache::PkgIterator const Parent = ParentPkg(); - if (Owner->Arch != Parent->Arch || Owner->Name == Parent->Name) + if (strcmp(Owner.Arch(), Parent.Arch()) != 0 || Owner->Name == Parent->Name) return true; return false; } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 538d10b35..f70cbd02a 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1316,10 +1316,11 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress } _error->RevertToStack(); } - else if (Debug == true) + else { _error->MergeWithStack(); - std::clog << "Open filebased MMap" << std::endl; + if (Debug == true) + std::clog << "Open filebased MMap" << std::endl; } } if (Writeable == false || CacheFile.empty() == true) diff --git a/buildlib/configure.mak b/buildlib/configure.mak index c0d8e3c76..68d0535b4 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -12,15 +12,42 @@ # It would be a fairly good idea to run this after a cvs checkout. BUILDDIR=build -.PHONY: startup +.PHONY: startup missing-config-files startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) # use the files provided from the system instead of carry around # and use (most of the time outdated) copycats +ifeq (file-okay,$(shell test -r buildlib/config.sub && echo 'file-okay')) +buildlib/config.sub: +else + ifeq (file-okay,$(shell test -r /usr/share/misc/config.sub && echo 'file-okay')) buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub + else +buildlib/config.sub: missing-config-files + endif +endif + +ifeq (file-okay,$(shell test -r buildlib/config.guess && echo 'file-okay')) +buildlib/config.guess: +else + ifeq (file-okay,$(shell test -r /usr/share/misc/config.guess && echo 'file-okay')) buildlib/config.guess: ln -sf /usr/share/misc/config.guess buildlib/config.guess + else +buildlib/config.guess: missing-config-files + endif +endif + +missing-config-files: + @echo "APT needs 'config.guess' and 'config.sub' in buildlib/ for configuration." + @echo "On Debian systems these are available in the 'autotools-dev' package." + @echo + @echo "The latest versions can be acquired from the upstream git repository:" + @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" + @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" + exit 100 + configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak index a97af0caf..7e22467cf 100644 --- a/buildlib/debiandoc.mak +++ b/buildlib/debiandoc.mak @@ -14,13 +14,15 @@ LOCAL := debiandoc-$(firstword $(SOURCE)) $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE)))) $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE)))) +debiandoc: + #--------- # Rules to build HTML documentations ifdef DEBIANDOC_HTML # Install generation hooks -doc: $($(LOCAL)-HTML) +debiandoc: $($(LOCAL)-HTML) veryclean: veryclean/html/$(LOCAL) vpath %.sgml $(SUBDIRS) @@ -42,7 +44,7 @@ endif ifdef DEBIANDOC_TEXT # Install generation hooks -doc: $($(LOCAL)-TEXT) +debiandoc: $($(LOCAL)-TEXT) veryclean: veryclean/text/$(LOCAL) vpath %.sgml $(SUBDIRS) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 7b084f4b9..5b970876a 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -startup headers library clean veryclean program test update-po manpages: +startup headers library clean veryclean program test update-po manpages debiandoc: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 1dedd0dcd..09eca0ec2 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -13,6 +13,8 @@ SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) INCLUDES = apt.ent apt-verbatim.ent +manpages: + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -22,7 +24,7 @@ LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 442e0400b..ccbe54384 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2362,6 +2362,8 @@ bool DoDownload(CommandLine &CmdL) pkgRecords Recs(Cache); pkgSourceList *SrcList = Cache.GetSourceList(); + bool gotAll = true; + for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) @@ -2372,11 +2374,19 @@ bool DoDownload(CommandLine &CmdL) pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); pkgCache::VerFileIterator Vf = Ver.FileList(); if (Vf.end() == true) - return _error->Error("Can not find VerFile"); + { + _error->Error("Can not find VerFile for %s in version %s", Pkg.FullName().c_str(), Ver.VerStr()); + gotAll = false; + continue; + } pkgCache::PkgFileIterator F = Vf.File(); pkgIndexFile *index; if(SrcList->FindIndex(F, index) == false) - return _error->Error("FindIndex failed"); + { + _error->Error(_("Can't find a source to download version '%s' of '%s'"), Ver.VerStr(), Pkg.FullName().c_str()); + gotAll = false; + continue; + } string uri = index->ArchiveURI(rec.FileName()); strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr()); // get the most appropriate hash @@ -2392,6 +2402,8 @@ bool DoDownload(CommandLine &CmdL) // get the file new pkgAcqFile(&Fetcher, uri, hash.toStr(), (*Ver)->Size, descr, Pkg.Name(), "."); } + if (gotAll == false) + return false; // Just print out the uris and exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index e7faf88a9..aef7636e9 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -34,18 +34,16 @@ bool ShowHelp(CommandLine &CmdL) { COMMON_ARCH,__DATE__,__TIME__); std::cout << - _("Usage: apt-internal-resolver\n" + _("Usage: apt-internal-solver\n" "\n" - "apt-internal-resolver is an interface to use the current internal\n" + "apt-internal-solver is an interface to use the current internal\n" "like an external resolver for the APT family for debugging or alike\n" "\n" "Options:\n" " -h This help text.\n" " -q Loggable output - no progress indicator\n" " -c=? Read this configuration file\n" - " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" - "apt.conf(5) manual pages for more information and options.\n" - " This APT has Super Cow Powers.\n"); + " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"); return true; } /*}}}*/ diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 2d5eed29d..2a093c55a 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -367,7 +367,7 @@ bool ShowHelp(CommandLine &CmdL) _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" "apt-mark is a simple command line interface for marking packages\n" - "as manual or automatical installed. It can also list marks.\n" + "as manually or automatically installed. It can also list marks.\n" "\n" "Commands:\n" " auto - Mark the given packages as automatically installed\n" diff --git a/configure.in b/configure.in index c78a2c248..56eeaccbe 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.6ubuntu2" +PACKAGE_VERSION="0.9.7.1" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index f50bac52d..2f6dbbd28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,67 @@ +apt (0.9.7.1ubuntu1) quantal; urgency=low + + * merged from the debian-sid branch + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jun 2012 15:33:42 +0200 + +apt (0.9.7.1) unstable; urgency=low + + [ Program translation updates ] + * Bulgarian (Damyan Ivanov) (Closes: #678983) + * Hungarian (Gabor Kelemen) + * Italian (Milo Casagrande) + * Slovenian (Andrej Znidarsic) + * German (Holger Wansing) (Closes: #679314) + * Slovak (Ivan Masár) (Closes: #679448) + + [ David Kalnischkies ] + * cmdline/apt-internal-solver.cc, cmdline/apt-mark.cc: + - typo fixes and unfuzzy translations + * debian/control: + - libapt-{pkg,inst} packages should be in section 'libs' instead + of 'admin' as by ftp-master override request in #677596 + - demote debiandoc-sgml to Build-Depends-Indep + * doc/makefile: + - separate translation building of debiandoc from manpages + so that we don't need to build debiandoc for binary packages + + -- Michael Vogt <mvo@debian.org> Fri, 29 Jun 2012 14:26:32 +0200 + +apt (0.9.7) unstable; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix the Fallback option to work correctly, by not calling + realloc() on a map mapped by mmap(), and by using malloc + and friends instead of new[]. + - Zero out the new memory allocated with realloc(). + + [ Daniel Hartwig ] + * apt-pkg/pkgcachegen.cc: + - always reset _error->StackCount in MakeStatusCache (Closes: #677175) + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - ensure that mixed positive/negative architecture wildcards + are handled in the same way as dpkg handles them + - use PackageArchitectureMatchesSpecification filter + * apt-pkg/cachefilter.cc: + - add PackageArchitectureMatchesSpecification (Closes: #672603) + * apt-pkg/cacheset.cc: + - add PackageContainerInterface::FromGroup to support + architecture specifications with wildcards on the commandline + * apt-pkg/pkgcache.cc: + - do a string comparision for architecture checking in IsMultiArchImplicit + as 'unique' strings in the pkgcache aren't unique (Closes: #677454) + * buildlib/configure.mak: + - print a message detailing how to get config.guess and config.sub + in case they are not in /usr/share/misc (Closes: #677312) + * cmdline/apt-get.cc: + - print a friendly message in 'download' if a package can't be + downloaded (Closes: #677887) + + -- Michael Vogt <mvo@debian.org> Tue, 19 Jun 2012 16:42:43 +0200 + apt (0.9.6ubuntu3) quantal; urgency=low * SECURITY UPDATE: Disable apt-key net-update for now, as validation diff --git a/debian/control b/debian/control index 4bdd3ce70..b793d3f04 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext:any (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, - po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml -Build-Depends-Indep: doxygen + po4a (>= 0.34-2), autotools-dev, autoconf, automake +Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu Vcs-Browser: http://code.launchpad.net/apt/ubuntu @@ -42,6 +42,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Section: libs Description: package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -63,6 +64,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Section: libs Description: deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package diff --git a/debian/rules b/debian/rules index 27effcfb0..8da5ae790 100755 --- a/debian/rules +++ b/debian/rules @@ -70,7 +70,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build: build/build-stamp -build-doc: build-manpages build/build-doc-stamp +build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak @@ -101,9 +101,9 @@ else endif touch $@ -build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp +build/build-debiandoc-stamp: build/configure-stamp # Add here commands to compile the package. - $(MAKE) doc + $(MAKE) debiandoc touch $@ build/build-manpages-stamp: build/configure-stamp @@ -124,7 +124,7 @@ debian/%.install: debian/%.install.in binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-pkg-doc: build-doc +libapt-pkg-doc: build-debiandoc dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -150,7 +150,7 @@ libapt-pkg-doc: build-doc dh_md5sums -p$@ dh_builddeb -p$@ -apt-doc: build-doc +apt-doc: build-debiandoc dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 70f90c57e..d69087db3 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.6ubuntu2"> +<!ENTITY apt-product-version "0.9.7.1"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "lenny"> diff --git a/doc/makefile b/doc/makefile index f190046c0..4c27552f6 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,10 +11,7 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) -MANPAGEPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) -MANPAGEPOLIST = $(patsubst %,manpages-translation-%,$(MANPAGEPO)) - -doc: manpages +doc: manpages debiandoc # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -27,29 +24,17 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) +manpages: $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< -$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a - $(MAKE) -C $(dir $<) doc - -.PHONY: manpages dirs-manpage-subdirs $(MANPAGEPOLIST) -dirs: dirs-manpage-subdirs -dirs-manpage-subdirs: - for i in $(MANPAGEPO); do \ - test -d $$i || mkdir $$i; \ - test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - done - # Clean rule .PHONY: veryclean/$(LOCAL) veryclean: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) - endif # Chain to the manpage rule @@ -65,7 +50,7 @@ TO = $(DOC) TARGET = binary include $(COPY_H) -.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc +.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats clean: clean-subdirs veryclean: veryclean-subdirs @@ -80,24 +65,53 @@ veryclean-subdirs: rm -rf $$dir; \ done -.PHONY: update-po po4a stats +stats: + for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef PO4A -doc: po4a +DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO)) +DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO)) + +MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) + +.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST) + +manpages: $(MANPAGEPOLIST) +debiandoc: $(DEBIANDOCPOLIST) +po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) update-po: po4a --previous --no-backups --force --no-translations \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf -po4a: - po4a --previous --no-backups \ +$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf + po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.4.xml,%.$(subst /,,$(dir $<)).4.xml,$(wildcard *.4.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.5.xml,%.$(subst /,,$(dir $<)).5.xml,$(wildcard *.5.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.6.xml,%.$(subst /,,$(dir $<)).6.xml,$(wildcard *.6.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.7.xml,%.$(subst /,,$(dir $<)).7.xml,$(wildcard *.7.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf -endif + $(MAKE) -C $(dir $<) manpages -stats: - for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done +$(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf + po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \ + --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf + $(MAKE) -C $(dir $<) debiandoc + +dirs: $(MANPAGEDIRLIST) +$(MANPAGEDIRLIST) :: %/makefile : lang.makefile + test -d $(dir $@) || mkdir $(dir $@) + sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ +endif ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) @@ -114,5 +128,5 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile $(DOXYGEN) $(BUILD)/doc/Doxyfile touch $(BUILD)/doc/doxygen-stamp -doc: $(BUILD)/doc/doxygen-stamp +debiandoc: $(BUILD)/doc/doxygen-stamp endif diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 4a8e86962..b3a388c7e 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.6\n" +"Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-06-26 13:47+0300\n" +"POT-Creation-Date: 2012-06-29 14:26+0300\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" @@ -3455,6 +3455,31 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiáu" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates ye un preséu pa sacar información de\n" +#~ "configuración y plantíes de paquetes de debian.\n" +#~ "\n" +#~ "Opciones:\n" +#~ "-h Esti testu d'aida.\n" +#~ "-t Define'l direutoriu temporal\n" +#~ "-c=? Llei esti ficheru de configuración\n" +#~ "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Nun ye a desaniciar %s" @@ -4,21 +4,21 @@ # This file is distributed under the same license as the apt package. # # Yavor Doganov <yavor@doganov.org>, 2006. -# Damyan Ivanov <dmn@debian.org>, 2008, 2009, 2010. +# Damyan Ivanov <dmn@debian.org>, 2008, 2009, 2010, 2012. # 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: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2010-08-27 22:33+0300\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" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: binary\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: KBabel 1.11.4\n" #: cmdline/apt-cache.cc:158 @@ -111,7 +111,7 @@ msgstr "Трябва да въведете поне един шаблон за #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format @@ -166,7 +166,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" #: cmdline/apt-cache.cc:1686 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -203,15 +202,13 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Употреба: apt-cache [опции] команда\n" -" apt-cache [опции] add файл1 [файл2 ...]\n" " apt-cache [опции] showpkg пакет1 [пакет2 ...]\n" " apt-cache [опции] showsrc пакет1 [пакет2 ...]\n" "\n" -"apt-cache е инструмент на ниско ниво за обработка на двоичните\n" -"кеш файлове на APT и извличане на информация от тях\n" +"apt-cache е инструмент на ниско ниво за извличане на информация от\n" +"двоичните кеш файлове на APT\n" "\n" "Команди:\n" -" add - Добавяне на пакетен файл към кеша на пакети с изходен код\n" " gencaches - Генериране на кеша на пакети и пакети с изходен код\n" " showpkg - Показване на обща информация за даден пакет\n" " showsrc - Показване на записите за пакети с изходен код\n" @@ -221,7 +218,6 @@ msgstr "" " unmet - Показване на неудовлетворените зависимости\n" " search - Търсене в списъка с пакети за регулярен израз\n" " show - Показване на записа за пакет\n" -" showauto - Списък с пакетите, инсталирани автоматично\n" " depends - Необработена информация за зависимостите на даден пакет\n" " rdepends - Информация за обратните зависимости на даден пакет\n" " pkgnames - Списък с имената на всички пакети, за които има информация\n" @@ -235,7 +231,7 @@ msgstr "" " -s=? Кешът за пакети с изходен код.\n" " -q Премахване на индикатора за напредък.\n" " -i Показване само на важни зависимости при командата „unmet“.\n" -" -c=? Четене на този конфигурационен файл.\n" +" -c=? Указване на файл с настройки.\n" " -o=? Настройване на произволна конфигурационна опция, например -o dir::" "cache=/tmp\n" "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n" @@ -296,7 +292,7 @@ msgstr "Y" #: cmdline/apt-get.cc:140 msgid "N" -msgstr "" +msgstr "N" #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format @@ -453,14 +449,16 @@ msgstr "Виртуални пакети като „%s“ не могат да #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" +msgstr "" +"Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид " +"„%s“?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" +msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n" #: cmdline/apt-get.cc:788 #, c-format @@ -499,9 +497,9 @@ msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Избрана е версия %s (%s) за %s\n" #: cmdline/apt-get.cc:889 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Избрана е версия %s (%s) за %s\n" +msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n" #: cmdline/apt-get.cc:1025 msgid "Correcting dependencies..." @@ -760,10 +758,9 @@ msgstr[1] "" "%lu пакета са били инсталирани автоматично и вече не са необходими:\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Използвайте „apt-get autoremove“ за да ги премахнете." +msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете." msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете." #: cmdline/apt-get.cc:1854 @@ -825,6 +822,8 @@ msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark " +"manual“." #: cmdline/apt-get.cc:2183 msgid "Calculating upgrade... " @@ -849,7 +848,7 @@ msgstr "Неуспех при заключването на директория #: cmdline/apt-get.cc:2381 #, c-format msgid "Downloading %s %s" -msgstr "" +msgstr "Изтегляне на %s %s" #: cmdline/apt-get.cc:2439 msgid "Must specify at least one package to fetch source for" @@ -871,14 +870,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Използвайте:\n" -"bzr get %s\n" +"bzr branch %s\n" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" @@ -951,6 +950,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Липсва информация за архитектурата %s. Прегледайте информацията за APT::" +"Architectures в apt.conf(5)." #: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format @@ -964,13 +965,13 @@ msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" #: cmdline/apt-get.cc:2985 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " -"не може да бъде намерен" +"Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " +"за пакети „%s“" #: cmdline/apt-get.cc:3003 #, c-format @@ -989,23 +990,22 @@ msgstr "" "пакет %s е твърде нов" #: cmdline/apt-get.cc:3065 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже няма " -"налични версии на пакета %s, които могат да удовлетворят изискването за " -"версия" +"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " +"кандидат на пакета %s не може да удовлетвори изискването за версия" #: cmdline/apt-get.cc:3071 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " -"не може да бъде намерен" +"няма подходящи версии" #: cmdline/apt-get.cc:3094 #, c-format @@ -1022,16 +1022,15 @@ msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" #: cmdline/apt-get.cc:3208 cmdline/apt-get.cc:3220 -#, fuzzy, c-format +#, c-format msgid "Changelog for %s (%s)" -msgstr "Свързване с %s (%s)" +msgstr "Журнал на промените в %s (%s)" #: cmdline/apt-get.cc:3346 msgid "Supported modules:" msgstr "Поддържани модули:" #: cmdline/apt-get.cc:3387 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1089,7 +1088,7 @@ msgstr "" " upgrade - Обновяване на системата\n" " install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n" " remove - Премахване на пакети\n" -" autoremove - Автоматично премахване на неизползвани пакети\n" +" autoremove - Автоматично премахване на всички неизползвани пакети\n" " purge - Премахване на пакети, включително файловете им с настройки\n" " source - Изтегляне на изходен код на пакети\n" " build-dep - Конфигуриране на зависимостите за компилиране на пакети от\n" @@ -1099,8 +1098,8 @@ msgstr "" " clean - Изтриване на изтеглените файлове\n" " autoclean - Изтриване на стари изтеглени файлове\n" " check - Проверка за неудовлетворени зависимости\n" -" markauto - Отбелязване на дадените пакети като инсталирани автоматично\n" -" unmarkauto - отбелязване на дадените пакети като инсталирани ръчно\n" +" changelog - Изтегляне и показване на журнала с промени в даден пакет\n" +" download - Изтегляне на двоичен пакет в текущата директория\n" "\n" "Опции:\n" " -h Този помощен текст.\n" @@ -1171,29 +1170,29 @@ msgstr "" "в устройството „%s“ и натиснете „Enter“\n" #: cmdline/apt-mark.cc:55 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "но той не е инсталиран" +msgstr "Пакетът „%s“ не може да бъде маркиран, защото не е инсталиран.\n" #: cmdline/apt-mark.cc:61 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s е отбелязан като ръчно инсталиран.\n" +msgstr "Пакетът „%s“ вече е отбелязан като ръчно инсталиран.\n" #: cmdline/apt-mark.cc:63 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s е отбелязан като автоматично инсталиран.\n" +msgstr "Пакетът „%s“ вече е отбелязан като автоматично инсталиран.\n" #: cmdline/apt-mark.cc:228 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s вече е най-новата версия.\n" +msgstr "Пакетът „%s“ вече е задуржан.\n" #: cmdline/apt-mark.cc:230 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s вече е най-новата версия.\n" +msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 @@ -1202,18 +1201,18 @@ msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s е отбелязан като ръчно инсталиран.\n" +msgstr "Пакетът „%s“ е задържан.\n" #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Неуспех при отварянето на %s" +msgstr "Отмяна на задържането на пакета „%s“.\n" #: cmdline/apt-mark.cc:320 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?" #: cmdline/apt-mark.cc:367 msgid "" @@ -1524,7 +1523,7 @@ msgstr "" #: methods/gzip.cc:65 msgid "Empty files can't be valid archives" -msgstr "" +msgstr "Празни файлове не могат да бъдат валидни архиви" #: methods/http.cc:394 msgid "Waiting for headers" @@ -1623,9 +1622,9 @@ msgstr "Файлът „%s“ на огледалния сървър не е н #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:287 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Файлът „%s“ на огледалния сървър не е намерен " +msgstr "Грешка при четене файла „%s“ от огледалния сървър" #: methods/mirror.cc:442 #, c-format @@ -1984,19 +1983,19 @@ msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" #: ftparchive/override.cc:61 ftparchive/override.cc:167 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Неправилно форматиран override %s, ред %lu #1" +msgstr "Неправилно форматиран override %s, ред %llu #1" #: ftparchive/override.cc:75 ftparchive/override.cc:179 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Неправилно форматиран override %s, ред %lu #2" +msgstr "Неправилно форматиран override %s, ред %llu #2" #: ftparchive/override.cc:89 ftparchive/override.cc:192 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Неправилно форматиран override %s, ред %lu #3" +msgstr "Неправилно форматиран override %s, ред %llu #3" #: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format @@ -2262,9 +2261,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Неуспех при дублиране на файлов манипулатор %i" #: apt-pkg/contrib/mmap.cc:118 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Неуспех при прехвърлянето в паметта на %lu байта" +msgstr "Неуспех при прехвърлянето в паметта на %llu байта" #: apt-pkg/contrib/mmap.cc:145 msgid "Unable to close mmap" @@ -2490,23 +2489,24 @@ msgstr "Неуспех при достъпа до заключване %s" #: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 #, c-format msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" #: apt-pkg/contrib/fileutl.cc:426 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" #: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" #: apt-pkg/contrib/fileutl.cc:453 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" +"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" #: apt-pkg/contrib/fileutl.cc:840 #, c-format @@ -2547,15 +2547,15 @@ msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " #: apt-pkg/contrib/fileutl.cc:1289 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" msgstr "" -"грешка при четене, все още има %lu за четене, но няма нито един останал" +"грешка при четене, все още има %llu за четене, но няма нито един останал" #: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "грешка при запис, все още име %lu за запис, но не успя" +msgstr "грешка при запис, все още име %llu за запис, но не успя" #: apt-pkg/contrib/fileutl.cc:1716 #, c-format @@ -2589,9 +2589,8 @@ msgid "The package cache file is an incompatible version" msgstr "Файлът за кеш на пакети е несъвместима версия" #: apt-pkg/pkgcache.cc:162 -#, fuzzy msgid "The package cache file is corrupted, it is too small" -msgstr "Файлът за кеш на пакети е повреден" +msgstr "Файлът за кеш на пакети е повреден, твърде малък е" #: apt-pkg/pkgcache.cc:167 #, c-format @@ -2781,9 +2780,9 @@ msgstr "" "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "Неуспех при отваряне на файла „%s“" +msgstr "Неуспех при конфигуриране на „%s“. " #: apt-pkg/packagemanager.cc:545 #, c-format @@ -2824,12 +2823,11 @@ msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571 -#, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " +"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или " "са използвани по-стари." #: apt-pkg/acquire.cc:81 @@ -2913,6 +2911,8 @@ msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците " +"няма такова издание" #: apt-pkg/policy.cc:396 #, c-format @@ -2942,9 +2942,9 @@ msgstr "Кешът има несъвместима система за верс #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (%s%d)" -msgstr "Възникна грешка при обработката на %s (FindPkg)" +msgstr "Възникна грешка при обработката на %s (%s%d)" #: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -3010,11 +3010,13 @@ msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" +"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." +"list или повреден файл)" #: apt-pkg/acquire-item.cc:1386 -#, fuzzy, c-format +#, c-format msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Неуспех при анализиране на файл Release %s" +msgstr "Не е открита контролна сума за „%s“ във файла Release" #: apt-pkg/acquire-item.cc:1428 msgid "There is no public key available for the following key IDs:\n" @@ -3026,6 +3028,8 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " +"прилагат обновявания от това хранилище." #: apt-pkg/acquire-item.cc:1488 #, c-format @@ -3234,7 +3238,7 @@ msgstr "Несъответствие на контролната сума за: #: apt-pkg/indexcopy.cc:659 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Файлът %s не започва с информация за подписване в обикновен текст." #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:690 @@ -3299,23 +3303,25 @@ msgstr "" #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 msgid "Send scenario to solver" -msgstr "" +msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости" #: apt-pkg/edsp.cc:209 msgid "Send request to solver" -msgstr "" +msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости" #: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" -msgstr "" +msgstr "Подготовка за приемане на решение" #: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" msgstr "" +"Външната програма за удовлетворяване на зависимости се провали без да изведе " +"съобщение за грешка" #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" -msgstr "" +msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" #: apt-pkg/deb/dpkgpm.cc:72 #, c-format @@ -3410,7 +3416,7 @@ msgstr "Изпълняване на dpkg" #: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" -msgstr "" +msgstr "Операцията е прекъсната" #: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" @@ -3492,6 +3498,72 @@ msgstr "" msgid "Not locked" msgstr "Без заключване" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Употреба: apt-mark [опции] {auto|manual} пкт1 [пкт2 …]\n" +#~ "\n" +#~ "apt-mark предоставя команден интерфейс за маркиране на пакети\n" +#~ "като инсталирани ръчно или автоматично. Предлага се и показване\n" +#~ "на текущата маркировка.\n" +#~ "\n" +#~ "Команди:\n" +#~ " auto — Маркиране на пакети като инсталирани автоматично\n" +#~ " manual — Маркиране на пакети като инсталирани ръчно\n" +#~ "\n" +#~ "Опции:\n" +#~ " -h Тази помощна информация\n" +#~ " -q Изход без информация за напредъка, подходящ за съхраняване\n" +#~ " -qq Без изход, освен при грешки\n" +#~ " -s Симулация. Само се извежда какво би било направено\n" +#~ " -f Четене/запис на информацията за маркировката от указания файл\n" +#~ " -c=? Указване на файл с настройки\n" +#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" +#~ "За повече информация прегледайте ръководствата apt-mark(8) и apt.conf(5)." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Употреба: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver е интерфейс към вградения в APT механизъм за " +#~ "удовлетворяване на зависимости\n" +#~ "\n" +#~ "Опции:\n" +#~ " -h Този помощен текст\n" +#~ " -q Изход, подходящ за журнал — без индикатор на напредъка\n" +#~ " -c=? Указване на файл с настройки\n" +#~ " -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Неуспех при премахването на %s" @@ -3512,6 +3512,72 @@ msgstr "" msgid "Not locked" msgstr "No blocat" +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n" +#~ "\n" +#~ "apt-mark és una interfície simple de la línia d'ordres per a marcar\n" +#~ "paquets com a instaŀlats automàticament o manual. També pot llistar\n" +#~ "les marques.\n" +#~ "\n" +#~ "Ordres:\n" +#~ "\n" +#~ " auto - Marca els paquets donats com a instaŀlats automàticament\n" +#~ " manual - Marca els paquets donats com a instaŀlats manualment\n" +#~ "\n" +#~ "Opcions:\n" +#~ " -h Aquest text d'ajuda.\n" +#~ " -q Sortida enregistrable - sense indicador de progrés\n" +#~ " -qq Sense sortida, llevat dels errors\n" +#~ " -s No actues. Mostra només què es faria.\n" +#~ " -f Llegeix/escriu les marques auto/manual emprant el fitxer donat\n" +#~ " -c=? Llegeix aquest fitxer de configuració\n" +#~ " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" +#~ "Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més " +#~ "informació." + +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" +#~ "\n" +#~ "apt-extracttemplates és una eina per a extreure informació de\n" +#~ "configuració i plantilles dels paquets debian\n" +#~ "\n" +#~ "Opcions:\n" +#~ " -h Aquest text d'ajuda.\n" +#~ " -t Estableix el directori temporal\n" +#~ " -c=? Llegeix aquest fitxer de configuració\n" +#~ " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "No es pot suprimir %s" @@ -3418,6 +3418,30 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „% msgid "Not locked" msgstr "Není uzamčen" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Použití: apt-extracttemplates soubor1 [soubor2 …]\n" +#~ "\n" +#~ "apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a " +#~ "šablony\n" +#~ "\n" +#~ "Volby:\n" +#~ " -h Tato nápověda.\n" +#~ " -t Nastaví dočasný adresář\n" +#~ " -c=? Načte tento konfigurační soubor\n" +#~ " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Selhalo odstranění %s" @@ -3482,6 +3482,31 @@ msgstr "" msgid "Not locked" msgstr "" +# FIXME: "debian" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +#~ "\n" +#~ "Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +#~ "templed o becynnau Debian.\n" +#~ "\n" +#~ "Opsiynnau:\n" +#~ " -h Dangos y testun cymorth hwn\n" +#~ " -t Gosod y cyfeiriadur dros dro\n" +#~ " -c=? Darllen y ffeil cyfluniad hwn\n" +#~ " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Methwyd dileu %s" @@ -868,14 +868,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Brug venligst:\n" -"bzr get %s\n" +"bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" #: cmdline/apt-get.cc:2554 @@ -3478,6 +3478,71 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet." msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n" +#~ "\n" +#~ "apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n" +#~ "som manuelt eller automatisk installeret. Programmet kan også vise\n" +#~ "markeringerne.\n" +#~ "\n" +#~ "Kommandoer:\n" +#~ " auto - Marker de givne pakker som automatisk installeret\n" +#~ " manual - Marker de givne pakker som manuelt installeret\n" +#~ "\n" +#~ "Tilvalg:\n" +#~ " -h Denne hjælpetekst.\n" +#~ " -q Logbar uddata - ingen statusindikator\n" +#~ " -qq Ingen uddata undtagen for fejl\n" +#~ " -s Ingen handling. Viser kun hvad der ville blive udført.\n" +#~ " -f læs/skriv auto/manuel markering i den givne fil\n" +#~ " -c=? Læs denne konfigurationsfil\n" +#~ " -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/" +#~ "tmp\n" +#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Brug: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" +#~ "interne som en ekstern problemløser for APT-familien for fejlsøgning\n" +#~ "eller lignende\n" +#~ "\n" +#~ "Tilvalg:\n" +#~ " -h Denne hjælpetekst.\n" +#~ " -q Logbare uddata - ingen statusindikator\n" +#~ " -c=? Læs denne konfigurationsfil\n" +#~ " -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Kunne ikke slette %s" @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2012-05-12 23:00+0200\n" +"PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "Language: \n" @@ -457,14 +457,16 @@ msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden.\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n" +msgstr "" +"Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie " +"»%s«?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n" +msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n" #: cmdline/apt-get.cc:788 #, c-format @@ -772,10 +774,9 @@ msgstr[1] "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." +msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen." msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." #: cmdline/apt-get.cc:1854 @@ -887,14 +888,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Bitte verwenden Sie:\n" -"bzr get %s\n" +"bzr branch %s\n" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" @@ -3589,6 +3590,78 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "" +#~ "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " +#~ "herunterzuladen." + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n" +#~ "\n" +#~ "apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n" +#~ "oder automatisch installiert zu markieren. Diese Markierungen können " +#~ "auch\n" +#~ "aufgelistet werden.\n" +#~ "\n" +#~ "Befehle:\n" +#~ " auto – das angegebene Paket als »Automatisch installiert« markieren\n" +#~ " manual – das angegebene Paket als »Manuell installiert« markieren\n" +#~ "\n" +#~ "Optionen:\n" +#~ " -h dieser Hilfetext\n" +#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" +#~ " -qq keine Ausgabe, außer bei Fehlern\n" +#~ " -s nichts tun, nur eine Simulation der Aktionen durchführen\n" +#~ " -f Autom./Manuell-Markierung in der angegebenen Datei lesen/" +#~ "schreiben\n" +#~ " -c=? Diese Konfigurationsdatei benutzen\n" +#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" +#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n" +#~ "weitergehender Informationen und Optionen." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Aufruf: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n" +#~ "Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n" +#~ "Fehlersuche oder ähnlichem.\n" +#~ "\n" +#~ "Optionen:\n" +#~ " -h dieser Hilfetext\n" +#~ " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" +#~ " -c=? Diese Konfigurationsdatei benutzen\n" +#~ " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s konnte nicht entfernt werden." @@ -3409,6 +3409,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" +#~ "རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" +#~ "གདམ་ཁ་ཚུ།\n" +#~ " -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" +#~ " -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" +#~ " -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" +#~ " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" +#~ "tmp་བཟུམ།\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -3447,6 +3447,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" +#~ "\n" +#~ "το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" +#~ "και πρότυπα από πακέτα debian\n" +#~ "\n" +#~ "Επιλογές:\n" +#~ " -h Το παρόν κείμενο βοήθειας\n" +#~ " -t Καθορισμός προσωρινού καταλόγου\n" +#~ " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" +#~ " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Αποτυχία διαγραφής του %s" @@ -3559,6 +3559,31 @@ msgstr "" msgid "Not locked" msgstr "No bloqueado" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Uso: apt-extracttemplates archivo1 [archivo2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates es una herramienta para extraer información de\n" +#~ "configuración y plantillas de paquetes de debian.\n" +#~ "\n" +#~ "Opciones:\n" +#~ " -h Este texto de ayuda.\n" +#~ " -t Define el directorio temporal\n" +#~ " -c=? Lee este archivo de configuración\n" +#~ " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" +#~ "cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "No pude borrar %s" @@ -3409,6 +3409,32 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates debian-eko paketeen konfigurazioaren eta " +#~ "txantiloien\n" +#~ "informazioa ateratzeko tresna bat da\n" +#~ "\n" +#~ "Aukerak:\n" +#~ " -h Laguntza testu hau\n" +#~ " -t Ezarri aldi baterako direktorioa\n" +#~ " -c=? Irakurri konfigurazio fitxategi hau\n" +#~ " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Huts egin du %s kentzean" @@ -3402,6 +3402,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates on työkalu asetus- ja mallitietojen \n" +#~ "poimintaan debian-paketeista\n" +#~ "\n" +#~ "Valitsimet:\n" +#~ " -h Tämä ohje\n" +#~ " -t Aseta väliaikaisten tiedostojen kansio\n" +#~ " -c=? Lue tämä asetustiedosto\n" +#~ " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Tiedoston %s poistaminen ei onnistunut" @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2012-06-02 18:42+0200\n" +"PO-Revision-Date: 2012-06-25 19:58+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" -"Language: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #: cmdline/apt-cache.cc:158 @@ -454,14 +454,16 @@ msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" +msgstr "" +"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" +"être vouliez-vous écrire « %s » ?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" +msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n" #: cmdline/apt-get.cc:788 #, c-format @@ -775,10 +777,9 @@ msgstr[1] "" "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Veuillez utiliser « apt-get autoremove » pour les supprimer." +msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." #: cmdline/apt-get.cc:1854 @@ -891,14 +892,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Veuillez utiliser la commande :\n" -"bzr get %s\n" +"bzr branch %s\n" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" @@ -2858,8 +2859,8 @@ msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être " -"causé par les paquets devant être gardés en l'état." +"Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " +"par les paquets devant être gardés en l'état." #: apt-pkg/algorithms.cc:1225 msgid "Unable to correct problems, you have held broken packages." @@ -3557,6 +3558,80 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "" +#~ "Impossible de trouver une source de téléchargement de la version « %s » " +#~ "de « %s »" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Utilisation: apt-mark [options] {auto|manual} paquet 1 [paquet2 ...]\n" +#~ "\n" +#~ "apt-mark est une interface simple, en ligne de commande, qui permet\n" +#~ "de marquer des paquets comme installés manuellement ou automatiquement.\n" +#~ "Cette commande permet également d'afficher cet état.\n" +#~ "\n" +#~ "Commandes :\n" +#~ " auto - marquer les paquets indiqués comme installés automatiquement\n" +#~ " manual - marquer les paquets indiqués comme installés manuellement\n" +#~ "\n" +#~ "Options:\n" +#~ " -h Affiche la présente aide.\n" +#~ " -q Affichage journalisable - pas de barre de progression\n" +#~ " -qq Pas d'affichage à part les erreurs\n" +#~ " -s Mode simulation : aucune action effectuée.\n" +#~ " Affiche simplement ce qui serait effectué.\n" +#~ " -f lecture/écriture des états dans le fichier indiqué\n" +#~ " -c=? lecture du fichier de configuration indiqué\n" +#~ " -o=? utilisation d'une option de configuration,\n" +#~ " p. ex. -o dir::cache=/tmp\n" +#~ "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n" +#~ "pour plus d'informations." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Utilisation: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver est une interface en ligne de commande\n" +#~ "permettant d'utiliser la résolution interne d'apt de manière externe\n" +#~ "avec les outils de la famille d'APT à des fins de déboguage ou\n" +#~ "équivalent.\n" +#~ "\n" +#~ "Options:\n" +#~ " -h La présente aide.\n" +#~ " -q Affichage journalisable - pas de barre de progression\n" +#~ " -c=? lecture du fichier de configuration indiqué\n" +#~ " -o=? utilisation d'une option de configuration,\n" +#~ " p. ex. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Impossible de supprimer %s" @@ -3501,6 +3501,31 @@ msgstr "" msgid "Not locked" msgstr "Non está bloqueado" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Uso: apt-extracttemplates fich1 [fich2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates é unha ferramenta para extraer información\n" +#~ "de configuración e patróns dos paquetes debian\n" +#~ "\n" +#~ "Opcións:\n" +#~ " -h Este texto de axuda\n" +#~ " -t Estabelece o directorio temporal\n" +#~ " -c=? Le este ficheiro de configuración\n" +#~ " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::" +#~ "cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Non foi posíbel retirar %s" @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2012-01-06 22:03+0100\n" +"PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "Language: hu\n" @@ -202,8 +202,8 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Használat: apt-cache [kapcsolók] parancs\n" -" apt-cache [kapcsolók] showpkg pkg1 [pkg2 …]\n" -" apt-cache [kapcsolók] showsrc pkg1 [pkg2 …]\n" +" apt-cache [kapcsolók] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [kapcsolók] showsrc pkg1 [pkg2 ...]\n" "\n" "Az apt-cache egy alacsony szintű eszköz információk lekérdezésére\n" "az APT bináris gyorsítótár-fájljaiból\n" @@ -446,14 +446,15 @@ msgstr "A virtuális csomagokat, mint a(z) „%s” nem lehet eltávolítani\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "A megadott %s csomag nincs telepítve, így nem lett törölve\n" +msgstr "" +"A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "A megadott %s csomag nincs telepítve, így nem lett törölve\n" +msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n" #: cmdline/apt-get.cc:788 #, c-format @@ -497,7 +498,7 @@ msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” mia #: cmdline/apt-get.cc:1025 msgid "Correcting dependencies..." -msgstr "Függőségek javítása…" +msgstr "Függőségek javítása..." #: cmdline/apt-get.cc:1028 msgid " failed." @@ -751,10 +752,9 @@ msgstr[1] "" "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Ezeket az „apt-get autoremove” paranccsal törölheti." +msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti." msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti." #: cmdline/apt-get.cc:1854 @@ -822,7 +822,7 @@ msgstr "" #: cmdline/apt-get.cc:2183 msgid "Calculating upgrade... " -msgstr "Frissítés kiszámítása… " +msgstr "Frissítés kiszámítása... " #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" @@ -866,14 +866,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Használja a következő parancsot:\n" -"bzr get %s\n" +"bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" #: cmdline/apt-get.cc:2554 @@ -1070,8 +1070,8 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Használat: apt-get [kapcsolók] parancs\n" -" apt-get [kapcsolók] install|remove pkg1 [pkg2 …]\n" -" apt-get [kapcsolók] source pkg1 [pkg2 …]\n" +" apt-get [kapcsolók] install|remove pkg1 [pkg2 ...]\n" +" apt-get [kapcsolók] source pkg1 [pkg2 ...]\n" "\n" "Az apt-get egy egyszerű parancssori felület csomagok letöltéséhez és\n" "telepítéséhez. A leggyakrabban használt parancsok az update és az install. \n" @@ -1723,7 +1723,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Használat:apt-extracttemplates fájl1 [fájl2 …]\n" +"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n" "\n" "Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk " "debian-\n" @@ -1991,19 +1991,19 @@ msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" #: ftparchive/override.cc:61 ftparchive/override.cc:167 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Deformált felülbírálás %s %lu. sorában #1" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" #: ftparchive/override.cc:75 ftparchive/override.cc:179 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Deformált felülbírálás %s %lu. sorában #2" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" #: ftparchive/override.cc:89 ftparchive/override.cc:192 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Deformált felülbírálás %s %lu. sorában #3" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" #: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format @@ -2103,7 +2103,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 …]\n" +"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n" "\n" "Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s " "kapcsolót\n" @@ -2285,9 +2285,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Nem lehetett kettőzni a(z) %i fájlleírót" #: apt-pkg/contrib/mmap.cc:118 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Nem sikerült %lu bájtot mmap-olni" +msgstr "Nem sikerült %llu bájtot mmap-olni" #: apt-pkg/contrib/mmap.cc:145 msgid "Unable to close mmap" @@ -2419,12 +2419,12 @@ msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" #: apt-pkg/contrib/progress.cc:146 #, c-format msgid "%c%s... Error!" -msgstr "%c%s… Hiba!" +msgstr "%c%s... Hiba!" #: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Done" -msgstr "%c%s… Kész" +msgstr "%c%s... Kész" #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@ -2572,14 +2572,14 @@ msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " #: apt-pkg/contrib/fileutl.cc:1289 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" -msgstr "olvasás, még kellene %lu, de már az összes elfogyott" +msgstr "olvasás, még kellene %llu, de már az összes elfogyott" #: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "írás, még kiírandó %lu, de ez nem lehetséges" +msgstr "írás, még kiírandó %llu, de ez nem lehetséges" #: apt-pkg/contrib/fileutl.cc:1716 #, c-format @@ -2807,9 +2807,9 @@ msgstr "" "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "A(z) „%s” fájl megnyitása sikertelen" +msgstr "A(z) „%s” beállítása sikertelen" #: apt-pkg/packagemanager.cc:545 #, c-format @@ -3144,7 +3144,7 @@ msgstr "" #: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656 msgid "Identifying.. " -msgstr "Azonosítás… " +msgstr "Azonosítás... " #: apt-pkg/cdrom.cc:587 #, c-format @@ -3153,7 +3153,7 @@ msgstr "Tárolt címke: %s\n" #: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879 msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM leválasztása…\n" +msgstr "CD-ROM leválasztása...\n" #: apt-pkg/cdrom.cc:616 #, c-format @@ -3166,15 +3166,15 @@ msgstr "CD-ROM leválasztása\n" #: apt-pkg/cdrom.cc:639 msgid "Waiting for disc...\n" -msgstr "Várakozás a lemezre…\n" +msgstr "Várakozás a lemezre...\n" #: apt-pkg/cdrom.cc:648 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM csatolása…\n" +msgstr "CD-ROM csatolása...\n" #: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" -msgstr "Indexfájlok keresése a lemezen…\n" +msgstr "Indexfájlok keresése a lemezen...\n" #: apt-pkg/cdrom.cc:716 #, c-format @@ -3213,7 +3213,7 @@ msgstr "" #: apt-pkg/cdrom.cc:802 msgid "Copying package lists..." -msgstr "Csomaglisták másolása…" +msgstr "Csomaglisták másolása..." #: apt-pkg/cdrom.cc:829 msgid "Writing new source list\n" @@ -3433,7 +3433,7 @@ msgstr "A dpkg futtatása" #: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" -msgstr "" +msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" #: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" @@ -3511,6 +3511,76 @@ msgstr "" msgid "Not locked" msgstr "Nincs zárolva" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 ...]\n" +#~ "\n" +#~ "Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n" +#~ "kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket " +#~ "is.\n" +#~ "\n" +#~ "Parancsok:\n" +#~ " auto -Az adott csomagok megjelölése automatikusan telepítettként\n" +#~ " manual - Az adott csomagok megjelölése kézzel telepítettként\n" +#~ "\n" +#~ "Kapcsolók:\n" +#~ " -h Ez a súgó szöveg.\n" +#~ " -q Naplózható kimenet - nincs folyamatjelző\n" +#~ " -qq Nincs kimenet, kivéve a hibákat\n" +#~ " -s Szimulációs mód. Csak kiírja, mi történne.\n" +#~ " -f auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n" +#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n" +#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" +#~ "tmp\n" +#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n" +#~ "információkért." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Használat: apt-internal-solver\n" +#~ "\n" +#~ "Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n" +#~ "feloldóként használható az APT családhoz hibakeresési vagy hasonló " +#~ "céllal\n" +#~ "\n" +#~ "Kapcsolók:\n" +#~ " -h Ez a súgó szöveg.\n" +#~ " -q Naplózható kimenet - nincs folyamatjelző\n" +#~ " -c=? Ezt a konfigurációs fájlt olvassa be\n" +#~ " -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s eltávolítása sikertelen" @@ -1,24 +1,24 @@ # Italian translation of apt -# Copyright (C) 2002-2010, 2011 The Free Software Foundation, Inc. +# Copyright (C) 2002-2010, 2011, 2012 The Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon <samu@debian.org>, 2002. -# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011. +# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2011-05-16 21:38+0200\n" +"PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Launchpad-Export-Date: 2011-02-21 18:00+0000\n" -"X-Generator: Launchpad (build 12406)\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n" +"X-Generator: Launchpad (build 15482)\n" #: cmdline/apt-cache.cc:158 #, c-format @@ -111,6 +111,7 @@ msgstr "È necessario specificare almeno un modello per la ricerca" #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" +"Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto." #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format @@ -165,7 +166,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" #: cmdline/apt-cache.cc:1686 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -205,8 +205,8 @@ msgstr "" " apt-cache [OPZIONI] showpkg PKG1 [PKG2 ...]\n" " apt-cache [OPZIONI] showsrc PKG1 [PKG2 ...]\n" "\n" -"apt-cache è uno strumento di basso livello usato per manipolare \n" -"i file di cache dei binari di APT e cercare informazioni in questi\n" +"apt-cache è uno strumento di basso livello usato per cercare informazioni \n" +"nei file di cache dei binari di APT\n" "\n" "Comandi:\n" " gencaches - Costruisce sia la cache dei pacchetti sia quella dei " @@ -219,7 +219,6 @@ msgstr "" " unmet - Mostra le dipendenze non soddisfatte\n" " search - Cerca nell'elenco dei pacchetti un'espressione regolare\n" " show - Mostra un campo leggibile per il pacchetto specificato\n" -" showauto - Visualizza un elenco di pacchetti installati automaticamente\n" " depends - Mostra informazioni di dipendenza per un pacchetto\n" " rdepends - Mostra informazioni di dipendenza all'incontrario per un " "pacchetto\n" @@ -236,7 +235,7 @@ msgstr "" " -i Mostra solo dipendenze importanti per il comando unmet\n" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e " +"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n" "apt.conf(5).\n" #: cmdline/apt-cdrom.cc:79 @@ -294,7 +293,7 @@ msgstr "S" #: cmdline/apt-get.cc:140 msgid "N" -msgstr "" +msgstr "N" #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format @@ -433,7 +432,7 @@ msgid "" "is only available from another source\n" msgstr "" "Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n" -"pacchetto. Questo può significare che il pacchetto è mancante, è obsoleto\n" +"pacchetto. Questo potrebbe indicare che il pacchetto è mancante, obsoleto\n" "oppure è disponibile solo all'interno di un'altra sorgente\n" #: cmdline/apt-get.cc:700 @@ -452,14 +451,16 @@ msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n" +msgstr "" +"Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si " +"intendeva \"%s\"?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n" +msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n" #: cmdline/apt-get.cc:788 #, c-format @@ -689,7 +690,7 @@ msgstr[1] "" #: cmdline/apt-get.cc:1421 msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: questo viene svolto automaticamente da dpkg." +msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." #: cmdline/apt-get.cc:1559 #, c-format @@ -767,10 +768,9 @@ msgstr[1] "" "richiesti.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Usare \"apt-get autoremove\" per rimuoverli." +msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo." msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli." #: cmdline/apt-get.cc:1854 @@ -833,6 +833,8 @@ msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual" +"\" al suo posto." #: cmdline/apt-get.cc:2183 msgid "Calculating upgrade... " @@ -880,15 +882,15 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -"Usare:\n" -"bzr get %s\n" -"per recuperare gli ultimi (e probabilmente non rilasciati) aggiornamenti del " +"Utilizzare:\n" +"bzr branch %s\n" +"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" #: cmdline/apt-get.cc:2554 @@ -960,6 +962,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" +"(5) APT::Architectures per l'impostazione" #: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format @@ -972,13 +976,13 @@ msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" #: cmdline/apt-get.cc:2985 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " -"non può essere trovato" +"La dipendenza %s per %s non può essere soddisfatta perché %s non è " +"consentito su pacchetti \"%s\"" #: cmdline/apt-get.cc:3003 #, c-format @@ -997,22 +1001,22 @@ msgstr "" "è troppo recente" #: cmdline/apt-get.cc:3065 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " -"del pacchetto %s può soddisfare le richieste di versione" +"La dipendenza %s per %s non può essere soddisfatta perché la versione " +"candidata del pacchetto %s non può soddisfare i requisiti di versione" #: cmdline/apt-get.cc:3071 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " -"non può essere trovato" +"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " +"non ha una versione candidata" #: cmdline/apt-get.cc:3094 #, c-format @@ -1038,7 +1042,6 @@ msgid "Supported modules:" msgstr "Moduli supportati:" #: cmdline/apt-get.cc:3387 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1106,8 +1109,6 @@ msgstr "" " clean - Elimina i file dei pacchetti scaricati\n" " autoclean - Elimina i vecchi pacchetti scaricati\n" " check - Verifica che non ci siano dipendenze insoddisfatte\n" -" markauto - Imposta i pacchetti forniti come installati automaticamente\n" -" unmarkauto - Imposta i pacchetti forniti come installati manualmente\n" " changelog - Scarica e visualizza il changelog per il pacchetto indicato\n" " download - Scarica il pacchetto binario nella directory attuale\n" "\n" @@ -1181,29 +1182,29 @@ msgstr "" "nell'unità \"%s\" e premere Invio\n" #: cmdline/apt-mark.cc:55 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "ma non è installato" +msgstr "%s non può essere segnato perché non è installato.\n" #: cmdline/apt-mark.cc:61 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "È stato impostato %s per l'installazione manuale.\n" +msgstr "%s è già stato impostato come installato manualmente.\n" #: cmdline/apt-mark.cc:63 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s impostato automaticamente come installato.\n" +msgstr "%s è già stato impostato come installato automaticamente.\n" #: cmdline/apt-mark.cc:228 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s è già alla versione più recente.\n" +msgstr "%s è già stato impostato come bloccato.\n" #: cmdline/apt-mark.cc:230 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s è già alla versione più recente.\n" +msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 @@ -1212,18 +1213,18 @@ msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "È stato impostato %s per l'installazione manuale.\n" +msgstr "%s impostato come bloccato.\n" #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Apertura di %s non riuscita" +msgstr "Blocco su %s annullato.\n" #: cmdline/apt-mark.cc:320 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?" #: cmdline/apt-mark.cc:367 msgid "" @@ -1629,7 +1630,7 @@ msgstr "Impossibile passare a %s" #: methods/mirror.cc:280 #, c-format msgid "No mirror file '%s' found " -msgstr "Nessun file mirror \"%s\" trovato" +msgstr "Nessun file mirror \"%s\" trovato " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default @@ -1689,15 +1690,15 @@ msgstr "Eliminare tutti i file .deb precedentemente scaricati?" msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" "Si sono verificati alcuni errori nell'estrazione. Verrà tentata la " -"configurazione " +"configurazione" #: dselect/install:102 msgid "will be configured. This may result in duplicate errors" -msgstr "dei pacchetti installati. Questo potrebbe generare errori duplicati " +msgstr "dei pacchetti installati. Questo potrebbe generare errori duplicati" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "o errori causati da dipendenze mancanti. Questo non causa problemi, " +msgstr "o errori causati da dipendenze mancanti. Questo non causa problemi," #: dselect/install:104 msgid "" @@ -1997,19 +1998,19 @@ msgid "Unable to open %s" msgstr "Impossibile aprire %s" #: ftparchive/override.cc:61 ftparchive/override.cc:167 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Override non corretto: file %s riga %lu #1" +msgstr "Override %s riga %llu malformato #1" #: ftparchive/override.cc:75 ftparchive/override.cc:179 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Override non corretto: file %s riga %lu #2" +msgstr "Override %s riga %llu malformato #2" #: ftparchive/override.cc:89 ftparchive/override.cc:192 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Override non corretto: file %s riga %lu #3" +msgstr "Override %s riga %llu malformato #3" #: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format @@ -2111,7 +2112,7 @@ msgstr "Creazione delle pipe non riuscita" #: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " -msgstr "Esecuzione di gzip non riuscita" +msgstr "Esecuzione di gzip non riuscita " #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 msgid "Corrupted archive" @@ -2276,9 +2277,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Impossibile duplicare il descrittore del file %i" #: apt-pkg/contrib/mmap.cc:118 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Impossibile eseguire mmap di %lu byte" +msgstr "Impossibile creare mmap di %llu byte" #: apt-pkg/contrib/mmap.cc:145 msgid "Unable to close mmap" @@ -2570,14 +2571,14 @@ msgid "Failed to exec compressor " msgstr "Esecuzione non riuscita del compressore " #: apt-pkg/contrib/fileutl.cc:1289 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" -msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno" +msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" #: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile" +msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" #: apt-pkg/contrib/fileutl.cc:1716 #, c-format @@ -2611,9 +2612,8 @@ msgid "The package cache file is an incompatible version" msgstr "La versione del file della cache dei pacchetti è incompatibile" #: apt-pkg/pkgcache.cc:162 -#, fuzzy msgid "The package cache file is corrupted, it is too small" -msgstr "Il file della cache dei pacchetti è danneggiato" +msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo" #: apt-pkg/pkgcache.cc:167 #, c-format @@ -2808,9 +2808,9 @@ msgstr "" "Immediate-Configure\" (%d)." #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "Impossibile aprire il file \"%s\"" +msgstr "Impossibile configurare \"%s\". " #: apt-pkg/packagemanager.cc:545 #, c-format @@ -2851,7 +2851,6 @@ msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571 -#, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2859,6 +2858,7 @@ msgstr "" "Impossibile scaricare alcuni file di indice: saranno ignorati o verranno " "usati quelli vecchi." +# (ndt) sarebbe da controllare meglio assieme a quella dopo #: apt-pkg/acquire.cc:81 #, c-format msgid "List directory %spartial is missing." @@ -2940,6 +2940,8 @@ msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release " +"non è disponibile dalle sorgenti" #: apt-pkg/policy.cc:396 #, c-format @@ -2971,9 +2973,9 @@ msgstr "La cache ha un sistema di gestione delle versioni incompatibile" #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (%s%d)" -msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)" +msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" #: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -3058,6 +3060,8 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " +"questo repository non verranno applicati." #: apt-pkg/acquire-item.cc:1488 #, c-format @@ -3089,13 +3093,13 @@ msgstr "" "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." #: apt-pkg/acquire-item.cc:1694 -#, fuzzy, c-format +#, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " -"sistemare manualmente questo pacchetto." +"correggere manualmente questo pacchetto." # (ndt) sarebbe da controllare se veramente possono esistere più file indice #: apt-pkg/acquire-item.cc:1753 @@ -3156,7 +3160,7 @@ msgstr "Identificazione... " #: apt-pkg/cdrom.cc:587 #, c-format msgid "Stored label: %s\n" -msgstr "Etichette archiviate: %s \n" +msgstr "Etichette archiviate: %s\n" #: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879 msgid "Unmounting CD-ROM...\n" @@ -3269,7 +3273,7 @@ msgstr "Hash non corrispondente per %s" #: apt-pkg/indexcopy.cc:659 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Il file %s non inizia con un messaggio di firma in chiaro" #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:690 @@ -3338,23 +3342,23 @@ msgstr "" #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 msgid "Send scenario to solver" -msgstr "" +msgstr "Invia lo scenario al solver" #: apt-pkg/edsp.cc:209 msgid "Send request to solver" -msgstr "" +msgstr "Invia la richiesta al solver" #: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" -msgstr "" +msgstr "Preparazione alla ricezione della soluzione" #: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" -msgstr "" +msgstr "Il solver esterno è terminato senza un errore di messaggio" #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" -msgstr "" +msgstr "Esecuzione solver esterno" #: apt-pkg/deb/dpkgpm.cc:72 #, c-format @@ -3449,7 +3453,7 @@ msgstr "Esecuzione di dpkg" #: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" -msgstr "" +msgstr "L'operazione è stata interrotta prima di essere completata" #: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" @@ -3487,13 +3491,12 @@ msgstr "" "errore di memoria esaurita" #: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505 -#, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -"Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore per disco pieno." +"Non è stata scritta alcuna segnalazione di apport poiché il messaggio di " +"errore indica la presenza di un problema nel sistema locale" #: apt-pkg/deb/dpkgpm.cc:1526 msgid "" @@ -3532,6 +3535,76 @@ msgstr "" msgid "Not locked" msgstr "Non bloccato" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "" +#~ "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s" +#~ "\"" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n" +#~ "\n" +#~ "apt-mark è una semplice interfaccia a riga di comando per segnalare i " +#~ "pacchetti\n" +#~ "come installati manualmente o automaticamente. Può anche elencare le \n" +#~ "segnalazioni.\n" +#~ "\n" +#~ "Comandi:\n" +#~ " auto Segna i pacchetti forniti come installati automaticamente\n" +#~ " manual Segna i pacchetti forniti come installati manualmente\n" +#~ "\n" +#~ "Opzioni:\n" +#~ " -h Mostra questo aiuto\n" +#~ " -q Output registrabile, nessun indicatore di avanzamento\n" +#~ " -qq Nessun output eccetto gli errori\n" +#~ " -s Nessuna azione, stampa solamente cosa verrebbe fatto\n" +#~ " -f Legge/Scrivere la segnalazione nel file fornito\n" +#~ " -c=? Legge come configurazione il file specificato\n" +#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n" +#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n" +#~ "apt.conf(5)." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Uso: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n" +#~ "come resolver esterno per il debugging degli strumenti APT\n" +#~ "\n" +#~ "Opzioni:\n" +#~ " -h Mostra questo aiuto\n" +#~ " -q Output registrabile, nessun indicatore di avanzamento\n" +#~ " -c=? Legge come configurazione il file specificato\n" +#~ " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Rimozione di %s non riuscita" @@ -3607,9 +3680,6 @@ msgstr "Non bloccato" #~ msgid "Got a single header line over %u chars" #~ msgstr "Ricevuta una singola riga header su %u caratteri" -#~ msgid "Note: This is done automatic and on purpose by dpkg." -#~ msgstr "Nota: questo viene svolto automaticamente da dpkg." - #~ msgid "Malformed override %s line %lu #1" #~ msgstr "Override non corretto: file %s riga %lu #1" @@ -3619,23 +3689,12 @@ msgstr "Non bloccato" #~ msgid "Malformed override %s line %lu #3" #~ msgstr "Override non corretto: file %s riga %lu #3" -#~ msgid "decompressor" -#~ msgstr "de-compressore" - #~ msgid "read, still have %lu to read but none left" #~ msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno" #~ msgid "write, still have %lu to write but couldn't" #~ msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile" -#~ msgid "" -#~ "Could not perform immediate configuration on already unpacked '%s'. " -#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." -#~ msgstr "" -#~ "Impossibile eseguire immediatamente la configurazione su \"%s\" già " -#~ "estratto. Per maggiori informazioni, consultare \"man 5 apt.conf\" alla " -#~ "sezione \"APT::Immediate-Configure\"." - #~ msgid "Error occurred while processing %s (NewPackage)" #~ msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)" @@ -3651,9 +3710,6 @@ msgstr "Non bloccato" #~ msgid "Error occurred while processing %s (NewFileVer1)" #~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)" -#~ msgid "Error occurred while processing %s (NewVersion%d)" -#~ msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)" - #~ msgid "Error occurred while processing %s (UsePackage3)" #~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)" @@ -3666,10 +3722,16 @@ msgstr "Non bloccato" #~ msgid "Error occurred while processing %s (CollectFileProvides)" #~ msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)" -#, fuzzy -#~| msgid "Internal error, could not locate member %s" -#~ msgid "Internal error, could not locate member" -#~ msgstr "Errore interno, impossibile trovare il membro %s" +#~ msgid "decompressor" +#~ msgstr "de-compressore" -#~ msgid "Release file expired, ignoring %s (invalid since %s)" -#~ msgstr "File Release scaduto, %s viene ignorato (non valido da %s)" +#~ msgid "Error occurred while processing %s (NewVersion%d)" +#~ msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)" + +#~ msgid "" +#~ "Could not perform immediate configuration on already unpacked '%s'. " +#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." +#~ msgstr "" +#~ "Impossibile eseguire immediatamente la configurazione su \"%s\" già " +#~ "estratto. Per maggiori informazioni, consultare \"man 5 apt.conf\" alla " +#~ "sezione \"APT::Immediate-Configure\"." @@ -3474,6 +3474,30 @@ msgstr "" msgid "Not locked" msgstr "ロックされていません" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n" +#~ "抽出するためのツールです\n" +#~ "\n" +#~ "オプション:\n" +#~ " -h このヘルプを表示する\n" +#~ " -t 一時ディレクトリを指定する\n" +#~ " -c=? 指定した設定ファイルを読み込む\n" +#~ " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s の削除に失敗しました" @@ -3368,6 +3368,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "ការប្រើប្រាស់ ៖ apt-extracttemplates file1 [file2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates ជាឧបករណ៍ដើម្បីស្រង់ព័ត៌មានការរចនាសម្ព័ន្ធនិងពុម្ព\n" +#~ "ពីកញ្ចប់ដេបៀន \n" +#~ "\n" +#~ "ជម្រើស ៖ \n" +#~ " -h អត្ថបទជំនួយ\n" +#~ " -t កំណត់ថតបណ្ដោះអាសន្ន\n" +#~ " -c=? អានឯកសារការកំណត់រចនាស្ព័ន្ធនេះ\n" +#~ " -o=? កំណត់ជម្រើសការកំណត់រចនាសម្ព័ន្ធតាមចិត្ត ឧ. eg -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "បរាជ័យក្នុងការយក %s ចេញ" @@ -3411,6 +3411,30 @@ msgstr "" msgid "Not locked" msgstr "잠기지 않음" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "사용법: apt-extracttemplates 파일1 [파일2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" +#~ "도구입니다\n" +#~ "\n" +#~ "옵션:\n" +#~ " -h 이 도움말\n" +#~ " -t 임시 디렉토리 설정\n" +#~ " -c=? 설정 파일을 읽습니다\n" +#~ " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s을(를) 지우는데 실패했습니다" @@ -3193,6 +3193,32 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Bikaranîn: apt-config [vebijark] ferman\n" +#~ "apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" +#~ "\n" +#~ "Ferman\n" +#~ " shell - moda shell\n" +#~ " dump - Mîhengan nîşan dide\n" +#~ "\n" +#~ "Vebijark:\n" +#~ " -h Ev dosyeya alîkariyê ye.\n" +#~ " -c=? Dosyeya mîhengan nîşan dide\n" +#~ " -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar " +#~ "bike. mînak -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Rakirina %s biserneket" @@ -3293,6 +3293,31 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų " +#~ "informacijos išskleidimui\n" +#~ "iš debian paketų\n" +#~ "\n" +#~ "Parametrai:\n" +#~ " -h Šis pagalbos tekstas\n" +#~ " -t Nustatyti laikinąjį aplanką\n" +#~ " -c=? Nuskaityti šį konfigūracijų failą\n" +#~ " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Nepavyko pašalinti %s" @@ -3381,6 +3381,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" +#~ " \n" +#~ "ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" +#~ "डेबियन पॅकेजेस मधून \n" +#~ "\n" +#~ "पर्याय : \n" +#~ " -h हा साह्याकारी मजकूर \n" +#~ " -t टेंप डिर निर्धारित करा \n" +#~ " -c=? ही संरचना संचिका वाचा \n" +#~ " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s कायमचे काढून टाकण्यास असमर्थ" @@ -3440,6 +3440,31 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," msgid "Not locked" msgstr "Ikke låst" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates er et verktøy til å hente ut informasjon om " +#~ "innstillinger\n" +#~ "og maler fra debianpakker.\n" +#~ "\n" +#~ "Innstillinger:\n" +#~ " -h Denne hjelpeteksten\n" +#~ " -t Lag en midlertidig mappe\n" +#~ " -c=? Les denne innstillingsfila.\n" +#~ " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Klarte ikke å fjerne %s" @@ -3372,6 +3372,31 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "उपयोग: apt-extracttemplates file1 [file2 ...]\n" +#~ "\n" +#~ " apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण " +#~ "हो\n" +#~ "\n" +#~ "\n" +#~ "विकल्पहरू:\n" +#~ " -h यो मद्दत पाठ\n" +#~ " -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" +#~ " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" +#~ " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "%s लाई फेरी सार्न असफल भयो" @@ -3502,6 +3502,31 @@ msgstr "" msgid "Not locked" msgstr "Niet vergrendeld" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates is een programma om configuratie- en " +#~ "sjablooninformatie\n" +#~ "uit Debian pakketten te halen.\n" +#~ "\n" +#~ "Opties:\n" +#~ " -h Deze hulptekst.\n" +#~ " -t Stel de tijdelijke map in.\n" +#~ " -c=? Lees dit configuratiebestand.\n" +#~ " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Verwijderen van %s is mislukt" @@ -3391,6 +3391,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates er eit verkty for henta ut informasjon om\n" +#~ "oppsett og malar fr Debian-pakkar.\n" +#~ "\n" +#~ "Val:\n" +#~ " -h Vis denne hjelpeteksten\n" +#~ " -t Vel mellombels katalog\n" +#~ " -c=? Les denne innstillingsfila.\n" +#~ " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" + #~ msgid "Failed to remove %s" #~ msgstr "Klarte ikkje fjerna %s" @@ -3528,6 +3528,72 @@ msgstr "" msgid "Not locked" msgstr "Niezablokowany" +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n" +#~ "\n" +#~ "apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n" +#~ "jako zainstalowane automatycznie lub ręcznie. Może także służyć\n" +#~ "do wyświetlania stanu oznaczeń.\n" +#~ "\n" +#~ "Polecenia:\n" +#~ " auto - Oznacza dany pakiet jako zainstalowany automatycznie\n" +#~ " manual - Oznacza dany pakiet jako zainstalowany ręcznie\n" +#~ "\n" +#~ "Opcje:\n" +#~ " -h Ten tekst pomocy\n" +#~ " -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu " +#~ "działania)\n" +#~ " -qq Nie wypisuje nic oprócz komunikatów błędów\n" +#~ " -s Symulacja - wyświetla jedynie co powinno zostać zrobione\n" +#~ " -f zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n" +#~ " -c=? Czyta wskazany plik konfiguracyjny.\n" +#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n" +#~ "i apt.conf(5), aby uzyskać więcej informacji." + +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Użycie: apt-extracttemplates plik1 [plik2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates to narzędzie służące do pobierania informacji\n" +#~ "i konfiguracji i szablonach z pakietów Debiana.\n" +#~ "\n" +#~ "Opcje:\n" +#~ " -h Ten tekst pomocy.\n" +#~ " -t Ustawia katalog tymczasowy\n" +#~ " -c=? Czyta wskazany plik konfiguracyjny.\n" +#~ " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Nie udało się usunąć %s" @@ -3491,6 +3491,31 @@ msgstr "" msgid "Not locked" msgstr "Sem acesso exclusivo" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" +#~ "\n" +#~ "O apt-extracttemplates é uma ferramenta para extrair configuração\n" +#~ "e informação de template de pacotes debian.\n" +#~ "\n" +#~ "Opções:\n" +#~ " -h Este texto de ajuda\n" +#~ " -t Definir o directório temporário\n" +#~ " -c=? Ler este ficheiro de configuração\n" +#~ " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Falhou remover %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 63b8e9d9d..8ffb22550 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3439,6 +3439,32 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" +#~ "\n" +#~ "O apt-extracttemplates é uma ferramenta para extrair informações de " +#~ "modelo\n" +#~ "(\"template\") e configuração de pacotes debian.\n" +#~ "\n" +#~ "Opções:\n" +#~ " -h Este texto de ajuda\n" +#~ " -t Define o diretório temporário\n" +#~ " -c=? Lê o arquivo de configuração especificado.\n" +#~ " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Falhou ao remover %s" @@ -3447,6 +3447,31 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" +#~ "de configurare și a șabloanelor dintr-un pachet Debian\n" +#~ "\n" +#~ "Opțiuni\n" +#~ " -h Acest text de ajutor.\n" +#~ " -t Impune directorul temporar\n" +#~ " -c=? Citește acest fișier de configurare\n" +#~ " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Eșec la ștergerea lui %s" @@ -3530,6 +3530,73 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n" +#~ "\n" +#~ "apt-mark — простая программа с интерфейсом командной строки\n" +#~ "для отметки пакетов, что они установлены вручную или автоматически.\n" +#~ "Также может показывать списки помеченных пакетов.\n" +#~ "\n" +#~ "Команды:\n" +#~ " auto - пометить указанные пакеты, как установленные автоматически\n" +#~ " manual - пометить указанные пакеты, как установленные вручную\n" +#~ "\n" +#~ "Параметры:\n" +#~ " -h эта справка\n" +#~ " -q показывать сообщения о работе, не выводить индикатор хода работы\n" +#~ " -qq показывать только сообщения об ошибках\n" +#~ " -s не выполнять действия на самом деле, только имитация работы\n" +#~ " -f читать/писать данные о пометках в заданный файл\n" +#~ " -c=? читать указанный файл настройки\n" +#~ " -o=? задать значение произвольному параметру настройки,\n" +#~ " например, -o dir::cache=/tmp\n" +#~ "В справочных страницах apt-mark(8) и apt.conf(5)\n" +#~ "содержится подробная информация и описание параметров." + +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Использование: apt-extracttemplates файл1 [файл2…]\n" +#~ "\n" +#~ "apt-extracttemplates извлекает из пакетов Debian данные config и " +#~ "template\n" +#~ "\n" +#~ "Параметры:\n" +#~ " -h Этот текст\n" +#~ " -t Задать каталог для временных файлов\n" +#~ " -c=? Читать указанный файл настройки\n" +#~ " -o=? Задать значение произвольной настройке, например, -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Не удалось удалить %s" @@ -4,14 +4,14 @@ # thanks to Miroslav Kure <kurem@debian.cz> # # Peter Mann <Peter.Mann@tuke.sk>, 2006. -# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010, 2011. +# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2011-12-22 14:58+0100\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" "Language: sk\n" @@ -291,7 +291,7 @@ msgstr "Y" #: cmdline/apt-get.cc:140 msgid "N" -msgstr "" +msgstr "N" #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format @@ -447,14 +447,16 @@ msgstr "Virtuálne balíky ako „%s“ nemožno odstrániť\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n" +msgstr "" +"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli " +"„%s“?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n" +msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n" #: cmdline/apt-get.cc:788 #, c-format @@ -759,10 +761,9 @@ msgstr[2] "" "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Na ich odstránenie použite „apt-get autoremove“." +msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“." msgstr[1] "Na ich odstránenie použite „apt-get autoremove“." msgstr[2] "Na ich odstránenie použite „apt-get autoremove“." @@ -873,14 +874,14 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Prosím, použite:\n" -"bzr get %s\n" +"bzr branch %s\n" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" @@ -1985,19 +1986,19 @@ msgid "Unable to open %s" msgstr "Nedá sa otvoriť %s" #: ftparchive/override.cc:61 ftparchive/override.cc:167 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Skomolený „override“ %s riadok %lu #1" +msgstr "Skomolený „override“ %s riadok %llu #1" #: ftparchive/override.cc:75 ftparchive/override.cc:179 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Skomolený „override“ %s riadok %lu #2" +msgstr "Skomolený „override“ %s riadok %llu #2" #: ftparchive/override.cc:89 ftparchive/override.cc:192 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Skomolený „override“ %s riadok %lu #3" +msgstr "Skomolený „override“ %s riadok %llu #3" #: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format @@ -2262,9 +2263,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Nedá sa duplikovať popisovač súboru %i" #: apt-pkg/contrib/mmap.cc:118 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Nedá sa urobiť mmap %lu bajtov" +msgstr "Nedá sa urobiť mmap %llu bajtov" #: apt-pkg/contrib/mmap.cc:145 msgid "Unable to close mmap" @@ -2544,14 +2545,14 @@ msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " #: apt-pkg/contrib/fileutl.cc:1289 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" -msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva" +msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" #: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "zápis, stále treba zapísať %lu, no nedá sa to" +msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" #: apt-pkg/contrib/fileutl.cc:1716 #, c-format @@ -2585,9 +2586,8 @@ msgid "The package cache file is an incompatible version" msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie" #: apt-pkg/pkgcache.cc:162 -#, fuzzy msgid "The package cache file is corrupted, it is too small" -msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" +msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený, je príliš malý" #: apt-pkg/pkgcache.cc:167 #, c-format @@ -2771,9 +2771,9 @@ msgstr "" "man 5 apt.conf pod APT::Immediate-Configure (%d)" #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "Nedá sa otvoriť súbor „%s“" +msgstr "Nedá sa nakonfigurovať „%s“." #: apt-pkg/packagemanager.cc:545 #, c-format @@ -2926,9 +2926,9 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (%s%d)" -msgstr "Chyba pri spracovávaní %s (FindPkg)" +msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" #: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -3282,23 +3282,23 @@ msgstr "" #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 msgid "Send scenario to solver" -msgstr "" +msgstr "Poslať scénár riešiteľovi" #: apt-pkg/edsp.cc:209 msgid "Send request to solver" -msgstr "" +msgstr "Poslať požiadavku riešiteľovi" #: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" -msgstr "" +msgstr "Pripraviť sa na prijatie riešenia" #: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" -msgstr "" +msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy" #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" -msgstr "" +msgstr "Spustiť externého riešiteľa" #: apt-pkg/deb/dpkgpm.cc:72 #, c-format @@ -3393,7 +3393,7 @@ msgstr "Spúšťa sa dpkg" #: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" -msgstr "" +msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" #: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" @@ -3467,6 +3467,73 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s msgid "Not locked" msgstr "Nie je zamknuté" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n" +#~ "\n" +#~ "apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n" +#~ "balíkov ako manuálne alebo automaticky nainštalované.\n" +#~ "Tiež dokáže označenia vypisovať.\n" +#~ "\n" +#~ "Príkazy:\n" +#~ " auto - Označí uvedené balíky ako automaticky nainštalované\n" +#~ " manual - Označí uvedené balíky ako manuálne nainštalované\n" +#~ "\n" +#~ "Voľby:\n" +#~ " -h Tento text pomocníka.\n" +#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n" +#~ " -qq Nevypisovať nič, len chyby\n" +#~ " -s Nevykonávať zmeny. Iba vypísať, čo by sa urobilo.\n" +#~ " -f čítanie/zápis označenia auto/manálne v uvedenom súbore\n" +#~ " -c=? Načítať tento konfiguračný súbor\n" +#~ " -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n" +#~ "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf" +#~ "(5)." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Použitie: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n" +#~ "riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n" +#~ "\n" +#~ "Voľby:\n" +#~ " -h Tento pomocník.\n" +#~ " -q Výstup vhodný do záznamu - bez indikátora priebehu\n" +#~ " -c=? Načíta tento konfiguračný súbor\n" +#~ " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Odstránenie %s zlyhalo" @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2012-06-26 13:47+0200\n" -"PO-Revision-Date: 2011-03-06 15:47+0000\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" "Language: sl\n" @@ -14,8 +14,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2011-03-07 13:08+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2012-06-25 20:00+0000\n" +"X-Generator: Launchpad (build 15482)\n" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" @@ -110,7 +110,7 @@ msgstr "Podati morate vsaj en iskalni vzorec" #: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:462 #, c-format @@ -164,7 +164,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s kodno preveden na %s %s\n" #: cmdline/apt-cache.cc:1686 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -201,40 +200,39 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Uporaba: apt-cache [možnosti] ukaz\n" -" apt-cache [options] showpkg pak1 [pak2 ...]\n" -" apt-cache [options] showsrc pak1 [pak2 ...]\n" +" apt-cache [možnosti] showpkg paket1 [paket2 ...]\n" +" apt-cache [možnosti] showsrc paket1 [paket2 ...]\n" "\n" "apt-cache je orodje nizke ravni za poizvedbo podatkov\n" -"iz APT-ovih binarnih datotek predpomnilnika\n" +"iz binarni datotek predpomnilnika APT\n" "\n" "Ukazi:\n" -" gencaches - izgradi tako predpomnilnik paketa kot izvorne kode\n" -" showpkg - pokaže nekaj podrobnosti za posamezen paket\n" -" showsrc - pokaže zapise izvorne kode\n" -" stats - pokaže nekaj osnovne statistike\n" -" dump - pokaže celotno datoteko v obliki terse\n" -" dumpavail - izpiše razpoložljivo datoteko na stdout\n" -" unmet - pokaže nezadoščene odvisnosti\n" -" search - išče po seznamu paketov za vzorec logičnega izraza\n" -" show - pokaže berljiv zapis za paket\n" -" showauto - pokaže seznam samodejno nameščenih pakrov\n" -" depends - pokaže surove podrobnosti odvisnosti za paket\n" -" rdepends - pokaže obratne podrobnosti odvisnosti za paket\n" -" pkgnames - izpiše imena vseh paketov na sistemu\n" -" dotty - ustvari grafe paketov za GraphViz\n" -" xvcg - ustvari grafe paketov za xvcg\n" -" policy - pokaži nastavitve pravil\n" +" gencaches - Izgradi tako predpomnilnik paketa in izvorne kode\n" +" showpkg - Prikaže nekaj splošnih podatkov o posameznem paketu\n" +" showsrc - Prikaže zapise izvorne kode\n" +" stats - Prikaže nekaj osnovne statistike\n" +" dump - Prikaže celotno datoteko v skrajšani obliki\n" +" dumpavail - Izpiše razpoložljivo datoteko na stdout\n" +" unmet - Prikaže nezadoščene odvisnosti\n" +" search - Išče seznam paketov z vzorcem logičnega izraza\n" +" show - Show a readable record for the package\n" +" depends - Prikaže surove podatke odvisnosti za paket\n" +" rdepends - Pokaže obratne podatke odvisnosti za paket\n" +" pkgnames - Izpiše imena vseh paketov na sistemu\n" +" dotty - Ustvari grafe paketa za GraphViz\n" +" xvcg - Ustvari grafe paketa za xvcg\n" +" policy - Prikaže nastavitve pravil\n" "\n" "Možnosti:\n" -" -h to besedilo pomoči.\n" -" -p=? predpomnilnik paketa.\n" -" -s=? predpomnilnik izvorne kode.\n" -" -q onemogoči kazalnik napredka.\n" -" -i pokaže le pomembne odvisnosti za nezadoščen ukaz.\n" -" -c=? prebere to nastavitveno datoteko\n" -" -o=? nastavi poljubno nastavitveno možnost, npr -o dir::cahce=/tmp\n" -"Oglejte si strani priročnika apt-cache(8) in apt.conf(5) za več " -"podrobnosti.\n" +" -h To besedilo pomoči.\n" +" -p=? Predpomnilnik paketov.\n" +" -s=? Predpomnilnik izvorne kode.\n" +" -q Onemogoči kazalnik napredka.\n" +" -i Pokaže le pomembne odvisnosti za neujemajoč ukaz.\n" +" -c=? Prebere to nastavitveno datoteko\n" +" -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n" +"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt.conf" +"(5).\n" #: cmdline/apt-cdrom.cc:79 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" @@ -291,7 +289,7 @@ msgstr "Y" #: cmdline/apt-get.cc:140 msgid "N" -msgstr "" +msgstr "N" #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 #, c-format @@ -448,14 +446,15 @@ msgstr "Navideznih paketov kot je '%s' ni mogoče odstraniti\n" #. TRANSLATORS: Note, this is not an interactive question #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Paket %s ni nameščen, zato ni odstranjen\n" +msgstr "" +"Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 -#, fuzzy, c-format +#, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Paket %s ni nameščen, zato ni odstranjen\n" +msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n" #: cmdline/apt-get.cc:788 #, c-format @@ -762,12 +761,11 @@ msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n" msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n" #: cmdline/apt-get.cc:1835 -#, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev." -msgstr[1] "Uporabite 'apt-get autoremove' za njihovo odstranitev." -msgstr[2] "Uporabite 'apt-get autoremove' za njihovo odstranitev." +msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev." +msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev." msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev." #: cmdline/apt-get.cc:1854 @@ -829,6 +827,8 @@ msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark " +"manual'." #: cmdline/apt-get.cc:2183 msgid "Calculating upgrade... " @@ -875,15 +875,15 @@ msgstr "" "%s\n" #: cmdline/apt-get.cc:2501 -#, fuzzy, c-format +#, c-format msgid "" "Please use:\n" "bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" "Uporabite:\n" -"bzr get %s\n" -"za pridobivanje zadnjih (morda neizdanih) posodobitev paketa.\n" +"bzr branch %s\n" +"za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" #: cmdline/apt-get.cc:2554 #, c-format @@ -954,6 +954,8 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " +"apt.conf(5) APT::Architectures" #: cmdline/apt-get.cc:2803 cmdline/apt-get.cc:2806 #, c-format @@ -966,11 +968,12 @@ msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" #: cmdline/apt-get.cc:2985 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" -msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" +msgstr "" +"odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" #: cmdline/apt-get.cc:3003 #, c-format @@ -986,20 +989,22 @@ msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" #: cmdline/apt-get.cc:3065 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -"%s odvisnosti za %s ni mogoče zadostiti, ker nobena različica paketa %s ne " -"more zadostiti zahtevi po različici" +"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " +"%s ne more zadostiti zahtev različice" #: cmdline/apt-get.cc:3071 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" -msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" +msgstr "" +"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " +"%s nima različice kandidata" #: cmdline/apt-get.cc:3094 #, c-format @@ -1025,7 +1030,6 @@ msgid "Supported modules:" msgstr "Podprti moduli:" #: cmdline/apt-get.cc:3387 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1071,48 +1075,46 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Uporaba: apt-get [možnosti] ukaz\n" -" apt-get [možnosti] install|remove pak1 [pak2 ...]\n" -" apt-get [možnosti] source pak1 [pak2 ...]\n" +" apt-get [možnosti] install|remove paket1 [paket2 ...]\n" +" apt-get [možnosti] source paket1 [paket2 ...]\n" "\n" -"apt-get je enostaven vmesnik ukazne vrstice za prejemanje\n" -"in nameščanje paketov. Najpogosteje uporabljena ukaza\n" -"sta update in install.\n" +"apt-get je enostaven vmesnik ukazne vrstice za prejem in nameščanje\n" +"paketov. Najbolj pogosto uporabljana ukaza sta update in install.\n" "\n" "Ukazi:\n" -" update - pridobi sezname novih paketov\n" -" upgrade - izvede nadgradnjo\n" -" install - namesti nove pakete (paket je libc6, ne libc6.deb)\n" -" remove - odstrani pakete\n" -" autoremove - samodejno odstrani vse neuporabljene pakete\n" -" purge - odstrani pakete in nastavitvene datoteke\n" -" source - prejme arhive izvorne kode\n" -" dist-upgrade - nadgradnja distrbucije, oglejte si apt-get(8)\n" -" dselect-upgrade - sledi izbiram dselect\n" -" clean - izbriši prejete datoteke arhiva\n" -" autoclean - izbriše stare prejete datoteke arhiva\n" -" check - preveri, da ni zlomljenih odvisnosti\n" -" markauto - označi dane pakete kot samodejno nameščene\n" -" unmarkauto - označi dane pakete kot ročno nameščene\n" -" changelog - prejme in prikaže dnevnik sprememb za dani paket\n" -" download - prejme binarni paket v trenutno mapo\n" +" update - Pridobi nove sezname paketov\n" +" upgrade - Izvedix nadgradnjo\n" +" install - Namesti nove pakete (paket je libc6, ne libc6.deb)\n" +" remove - Odstrani pakete\n" +" autoremove - Samodejno odstrani vse neuporabljene pakete\n" +" purge - Odstrani pakete in nastavitvene datoteke\n" +" source - Prejmi arhive izvorne kode\n" +" build-dep - Nastavi odvisnosti gradnje za paket izvorne kode\n" +" dist-upgrade - Nadgradnja distribucije, oglejte si apt-get(8)\n" +" dselect-upgrade - Sledi izbiri dselect\n" +" clean - Izbriši prejete datoteke arhivov\n" +" autoclean - Izbriše stare prejete datoteke arhivov\n" +" check - Preveri, da ni pokvarjenih odvisnosti\n" +" changelog - Prejmi in prikaže dnevnik sprememb za dani paket\n" +" download - Prejmi binarni paket v trenutno mapo\n" "\n" "Možnosti:\n" -" -h to besedilo pomoči.\n" -" -q beležljiv izhod - brez indikatorja napredka\n" -" -qq ni izhoda razen napak\n" -" -d le prejmi - NE namesti ali odpakiraj arhivov\n" -" -s izvedi simulacijo ukaza\n" -" -y predpostavi Yes za vsa vprašanja in ne postavljaj vprašanj\n" -" -f poskusi popraviti sistem z zlomljenimi odvisnostmi\n" -" -m poskusi nadaljevati, če arhivov ni mogoče najti\n" -" -u pokaži tudi seznam nadgrajenih paketov\n" -" -b izgradi izvorni paket po njegovem pridobivanju\n" -" -V pokaže podrobno izpisane številke različic\n" -" -c=? prebere to nastavitveno datoteko\n" -" -o=? nastavi poljubno nastavitveno možnost, na primer dir::cache=/temo\n" -"Za več podrobnosti in možnosti si oglejte priročnike apt-get(8),\n" -"sources.list(5) in apt.conf(5).\n" -" Ta APT ima zmožnosti Super krave.\n" +" -h To besedilo pomoči.\n" +" -q Izhod se beleži - brez kazalnika napredka\n" +" -qq Ni izhoda razen napak\n" +" -d Le prejmi - NE nameščaj ali odpakiraj arhivov\n" +" -s Ne naredi ničesar. Izvedi simulacijo ukaza\n" +" -y Predpostavi Da vsem poizvedbam in ne pozivaj\n" +" -f Poskusi popraviti sistem s pokvarjenimi odvisnostmi\n" +" -m Poskusi nadaljevati, če arhivov ni mogoče najti\n" +" -u Pokaži tudi seznam nadgrajenih paketov\n" +" -b Po pridobitvi izgradi izvorni paket\n" +" -V Pokaži podrobne številke različic\n" +" -c=? Preberi to nastavitveno datoteko\n" +" -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/tmp\n" +"Za več podrobnosti in možnosti si oglejte strani priročnikov apt-get(8),\n" +" sources.list(5) in apt.conf(5). \n" +" Ta APT ima moči super krav.\n" #: cmdline/apt-get.cc:3552 msgid "" @@ -1164,29 +1166,29 @@ msgstr "" "v enoto '%s' in pritisnite vnosno tipko\n" #: cmdline/apt-mark.cc:55 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "vendar ni nameščen" +msgstr "paket %s ne more biti označen, ker ni nameščen.\n" #: cmdline/apt-mark.cc:61 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s je bil nastavljen na ročno nameščen.\n" +msgstr "paket %s je bil že nastavljen na ročno nameščen.\n" #: cmdline/apt-mark.cc:63 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s je nastavljen na samodejno nameščen.\n" +msgstr "paket %s je bil že nastavljen kot samodejno nameščen.\n" #: cmdline/apt-mark.cc:228 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "Najnovejša različica %s je že nameščena.\n" +msgstr "paket %s je bil že nastavljen kot na čakanju.\n" #: cmdline/apt-mark.cc:230 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "Najnovejša različica %s je že nameščena.\n" +msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 @@ -1195,18 +1197,18 @@ msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s je bil nastavljen na ročno nameščen.\n" +msgstr "paket %s je nastavljen kot na čakanju.\n" #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Ni mogoče odprti %s" +msgstr "Čakanje za %s je bilo preklicano.\n" #: cmdline/apt-mark.cc:320 msgid "Executing dpkg failed. Are you root?" -msgstr "" +msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?" #: cmdline/apt-mark.cc:367 msgid "" @@ -1610,9 +1612,9 @@ msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:287 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti " +msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" #: methods/mirror.cc:442 #, c-format @@ -1965,19 +1967,19 @@ msgid "Unable to open %s" msgstr "Ni mogoče odpreti %s" #: ftparchive/override.cc:61 ftparchive/override.cc:167 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #1" -msgstr "Napačno oblikovana prepisana vrstica %s %lu #1" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" #: ftparchive/override.cc:75 ftparchive/override.cc:179 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #2" -msgstr "Napačno oblikovana prepisana vrstica %s %lu #2" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" #: ftparchive/override.cc:89 ftparchive/override.cc:192 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu #3" -msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" #: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format @@ -2243,9 +2245,9 @@ msgid "Couldn't duplicate file descriptor %i" msgstr "Ni mogoče podvojiti opisnika datotek %i" #: apt-pkg/contrib/mmap.cc:118 -#, fuzzy, c-format +#, c-format msgid "Couldn't make mmap of %llu bytes" -msgstr "Ni mogoče narediti mmap %lu bajtov" +msgstr "Ni mogoče narediti mmap %llu bajtov" #: apt-pkg/contrib/mmap.cc:145 msgid "Unable to close mmap" @@ -2524,14 +2526,14 @@ msgid "Failed to exec compressor " msgstr "Ni mogoče izvesti stiskanja " #: apt-pkg/contrib/fileutl.cc:1289 -#, fuzzy, c-format +#, c-format msgid "read, still have %llu to read but none left" -msgstr "branje, še vedno %lu za branje, a nobeden ni ostal" +msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" #: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 -#, fuzzy, c-format +#, c-format msgid "write, still have %llu to write but couldn't" -msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče" +msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" #: apt-pkg/contrib/fileutl.cc:1716 #, c-format @@ -2565,9 +2567,8 @@ msgid "The package cache file is an incompatible version" msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva" #: apt-pkg/pkgcache.cc:162 -#, fuzzy msgid "The package cache file is corrupted, it is too small" -msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" +msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna" #: apt-pkg/pkgcache.cc:167 #, c-format @@ -2756,9 +2757,9 @@ msgstr "" "APT::Takojąnja-nastavitev za podrobnosti. (%d)" #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 -#, fuzzy, c-format +#, c-format msgid "Could not configure '%s'. " -msgstr "Ni mogoče odpreti datoteke '%s'" +msgstr "Ni mogoče nastaviti '%s' " #: apt-pkg/packagemanager.cc:545 #, c-format @@ -2880,6 +2881,8 @@ msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni " +"na voljo v virih" #: apt-pkg/policy.cc:396 #, c-format @@ -2909,9 +2912,9 @@ msgstr "Predpomnilnik ima neustrezen sistem različic" #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (%s%d)" -msgstr "Prišlo je do napake med obdelavo %s (Najdi paket)" +msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)" #: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2990,6 +2993,8 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " +"skladišče ne bo uveljavljena." #: apt-pkg/acquire-item.cc:1488 #, c-format @@ -3201,7 +3206,7 @@ msgstr "Neujemanje razpršila za: %s" #: apt-pkg/indexcopy.cc:659 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom" #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:690 @@ -3262,23 +3267,23 @@ msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni namešče #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 msgid "Send scenario to solver" -msgstr "" +msgstr "Pošlji scenarij reševalniku" #: apt-pkg/edsp.cc:209 msgid "Send request to solver" -msgstr "" +msgstr "Pošlji zahtevo reševalniku" #: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" -msgstr "" +msgstr "Priprava za rešitev prejemanja" #: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" -msgstr "" +msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah" #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" -msgstr "" +msgstr "Izvedi zunanji reševalnik" #: apt-pkg/deb/dpkgpm.cc:72 #, c-format @@ -3373,7 +3378,7 @@ msgstr "Poganjanje dpkg" #: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" -msgstr "" +msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" #: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" @@ -3410,13 +3415,12 @@ msgstr "" "zaradi pomanjkanja pomnilnika" #: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505 -#, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " -"polnega diska" +"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " +"na krajevnem sistemu" #: apt-pkg/deb/dpkgpm.cc:1526 msgid "" @@ -3450,6 +3454,74 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " msgid "Not locked" msgstr "Ni zaklenjeno" +#~ msgid "Can't find a source to download version '%s' of '%s'" +#~ msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manually or automatically installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n" +#~ "\n" +#~ "apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n" +#~ "kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n" +#~ "\n" +#~ "Ukazi:\n" +#~ " auto - Označi dane pakete kot samodejno nameščene\n" +#~ " manual - Označi dane pakete kot ročno nameščene\n" +#~ "\n" +#~ "Možnosti:\n" +#~ " -h To besedilo pomoči.\n" +#~ " -q Izhod se beleži - brez kazalnika napredka\n" +#~ " -qq Brez izhoda razen napak\n" +#~ " -s Ne naredi ničesar. Samo napiše kaj bi bilo narejeno.\n" +#~ " -f Prebere/zapiše oznako ročno/samodejno za dano datoteko\n" +#~ " -c=? Prebere to nastavitveno datoteko\n" +#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/" +#~ "tmp\n" +#~ "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf" +#~ "(5)." + +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Uporaba: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n" +#~ "reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali " +#~ "podobno.\n" +#~ "\n" +#~ "Možnosti:\n" +#~ " -h To besedilo pomoči\n" +#~ " -q Izhod se beleži - ni kazalnika napredka\n" +#~ " -c=? Prebere to nastavitveno datoteko\n" +#~ " -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Odstranitev %s ni uspela" @@ -3525,9 +3597,6 @@ msgstr "Ni zaklenjeno" #~ msgid "Got a single header line over %u chars" #~ msgstr "Dobljena je ena vrstica glave preko %u znakov" -#~ msgid "Note: This is done automatic and on purpose by dpkg." -#~ msgstr "Opomba: To je dpkg storil samodejno in namenoma." - #~ msgid "Malformed override %s line %lu #1" #~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1" @@ -3546,13 +3615,6 @@ msgstr "Ni zaklenjeno" #~ msgid "write, still have %lu to write but couldn't" #~ msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče" -#~ msgid "" -#~ "Could not perform immediate configuration on already unpacked '%s'. " -#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." -#~ msgstr "" -#~ "Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si " -#~ "man 5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti" - #~ msgid "Error occurred while processing %s (NewPackage)" #~ msgstr "Prišlo je do napake med obdelavo %s (Nov paket)" @@ -3583,200 +3645,9 @@ msgstr "Ni zaklenjeno" #~ msgid "Error occurred while processing %s (CollectFileProvides)" #~ msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)" -#~ msgid "Internal error, could not locate member" -#~ msgstr "Notranja napaka. Ni mogoče najti člana." - -#~ msgid "Internal error, group '%s' has no installable pseudo package" -#~ msgstr "Notranja napaka, skupina '%s' nima namestljivega psevdo paketa" - -#~ msgid "Release file expired, ignoring %s (invalid since %s)" -#~ msgstr "Datoteka Release je potekla, prezrtje %s (neveljavno od %s)" - -#~ msgid "short read in buffer_copy %s" -#~ msgstr "kratko branje v kopiji_medpomnilnika %s" - #~ msgid "" -#~ "Usage: apt-cache [options] command\n" -#~ " apt-cache [options] add file1 [file2 ...]\n" -#~ " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#~ " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-cache is a low-level tool used to manipulate APT's binary\n" -#~ "cache files, and query information from them\n" -#~ "\n" -#~ "Commands:\n" -#~ " add - Add a package file to the source cache\n" -#~ " gencaches - Build both the package and source cache\n" -#~ " showpkg - Show some general information for a single package\n" -#~ " showsrc - Show source records\n" -#~ " stats - Show some basic statistics\n" -#~ " dump - Show the entire file in a terse form\n" -#~ " dumpavail - Print an available file to stdout\n" -#~ " unmet - Show unmet dependencies\n" -#~ " search - Search the package list for a regex pattern\n" -#~ " show - Show a readable record for the package\n" -#~ " showauto - Display a list of automatically installed packages\n" -#~ " depends - Show raw dependency information for a package\n" -#~ " rdepends - Show reverse dependency information for a package\n" -#~ " pkgnames - List the names of all packages in the system\n" -#~ " dotty - Generate package graphs for GraphViz\n" -#~ " xvcg - Generate package graphs for xvcg\n" -#~ " policy - Show policy settings\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -p=? The package cache.\n" -#~ " -s=? The source cache.\n" -#~ " -q Disable progress indicator.\n" -#~ " -i Show only important deps for the unmet command.\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#~ msgstr "" -#~ "Uporaba: apt-cache [možnosti] ukaz\n" -#~ " apt-cache [možnosti] add datoteka1 [datoteka2 ...]\n" -#~ " apt-cache [možnosti] showpkg paket1 [paket2 ...]\n" -#~ " apt-cache [možnosti] showsrc paket 1 [paket2 ...]\n" -#~ "\n" -#~ "apt-cache je orodje nizke ravni, ki se uporablja za upravljanje APT-ovih\n" -#~ "binarnih datotek predpomnilnika in za poizvedbo podatkov iz njih\n" -#~ "\n" -#~ "Ukazi: add - dodat datoteko paketa v predpomnilnik vira\n" -#~ " gencaches - izgradi tako paket kot izvorni predpomnilnik\n" -#~ " showpkg - pokaže nekaj splošnih podatkov za posamezen paket\n" -#~ " showsrc - pokaže zapise vira\n" -#~ " stats - pokaže nekaj osnovne statistike\n" -#~ " dump - pokaže celotno datoteko v obliki terse\n" -#~ " dumpavail - izpiše razpoložljivo datoteko na standardni izhod\n" -#~ " unmet - pokaže nerazrešene odvisnosti\n" -#~ " search - išče seznam paketov za vzorec logičnega izraza\n" -#~ " show - išče berljiv zapis paketa\n" -#~ " showauto - pokaže seznam samodejno nameščenih paketov\n" -#~ " depends - pokaže surove podatke odvisnosti za paket\n" -#~ " rdepends - pokaže obratne podatke odvisnosti za paket\n" -#~ " pkgnames - našteje imena vseh paketov na sistemu\n" -#~ " dotty - ustvari grafe paketov za GraphViz\n" -#~ " xvcg - ustvari grafe paketov za xvcg\n" -#~ " policy - pokaže nastavitve pravil\n" -#~ "\n" -#~ "Možnosti:\n" -#~ " -h to besedilo pomoči\n" -#~ " -p=? predpomnilnik paketa\n" -#~ " -s=? predpomnilnik vira\n" -#~ " -q onemogoči pokazatelj napredka\n" -#~ " -i pokaže le pomembne odvisnosti za ukaz unmet.\n" -#~ " -c=? prebere podano datoteko nastavitev\n" -#~ " -o=? nastavi poljubno možnost nastavitev, na primer -o dir::cache=/tmp\n" -#~ "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt-conf" -#~ "(5).\n" - -#~ msgid "" -#~ "Usage: apt-get [options] command\n" -#~ " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -#~ " apt-get [options] source pkg1 [pkg2 ...]\n" -#~ "\n" -#~ "apt-get is a simple command line interface for downloading and\n" -#~ "installing packages. The most frequently used commands are update\n" -#~ "and install.\n" -#~ "\n" -#~ "Commands:\n" -#~ " update - Retrieve new lists of packages\n" -#~ " upgrade - Perform an upgrade\n" -#~ " install - Install new packages (pkg is libc6 not libc6.deb)\n" -#~ " remove - Remove packages\n" -#~ " autoremove - Remove automatically all unused packages\n" -#~ " purge - Remove packages and config files\n" -#~ " source - Download source archives\n" -#~ " build-dep - Configure build-dependencies for source packages\n" -#~ " dist-upgrade - Distribution upgrade, see apt-get(8)\n" -#~ " dselect-upgrade - Follow dselect selections\n" -#~ " clean - Erase downloaded archive files\n" -#~ " autoclean - Erase old downloaded archive files\n" -#~ " check - Verify that there are no broken dependencies\n" -#~ " markauto - Mark the given packages as automatically installed\n" -#~ " unmarkauto - Mark the given packages as manually installed\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text.\n" -#~ " -q Loggable output - no progress indicator\n" -#~ " -qq No output except for errors\n" -#~ " -d Download only - do NOT install or unpack archives\n" -#~ " -s No-act. Perform ordering simulation\n" -#~ " -y Assume Yes to all queries and do not prompt\n" -#~ " -f Attempt to correct a system with broken dependencies in place\n" -#~ " -m Attempt to continue if archives are unlocatable\n" -#~ " -u Show a list of upgraded packages as well\n" -#~ " -b Build the source package after fetching it\n" -#~ " -V Show verbose version numbers\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -#~ "pages for more information and options.\n" -#~ " This APT has Super Cow Powers.\n" -#~ msgstr "" -#~ "Uporaba: apt-get [možnosti] ukaz\n" -#~ " apt-get [možnosti] install|remove paket1 [paket2 ...]\n" -#~ " apt-get [možnosti] source paket1 [paket2 ...]\n" -#~ "\n" -#~ "apt-get je enostaven vmesnik ukazne vrstice za prejemanje in\n" -#~ "nameščanje paketov. Najpogosteje uporabljana ukaza sta update\n" -#~ "in install.\n" -#~ "\n" -#~ "Ukazi:\n" -#~ " update - pridobi nov seznam paketov\n" -#~ " upgrade - izvede nadgradnjo install - namesti nove pakete (paket je " -#~ "libc6 ne libc6.deb)\n" -#~ " remove - odstrani pakete\n" -#~ " autoremove - samodejno odstrani vse neuporabljene pakete\n" -#~ " purge - odstrani pakete in nastavitvene datoteke\n" -#~ " source - prejme izvorne arhive\n" -#~ " build-deb - nastavi odvisnosti gradnje za izvorne pakete\n" -#~ " dist-upgrade - nadgradi distribucijo, oglejte si apt-get(8)\n" -#~ " dselect-upgrade - sledi naslednjim izbiram\n" -#~ " clean - izbriše prejete datoteke arhivov\n" -#~ " markauto - označi dane pakete kot samodejno nameščene\n" -#~ " unmarkauto - odstrani dane pakete kot ročno nameščene\n" -#~ "\n" -#~ "Možnosti:\n" -#~ " -h to besedilo pomoči\n" -#~ " -q beležljiv izhod - brez pokazatelja napredka\n" -#~ " -qq brez izhoda razen za napake\n" -#~ " -d le prejme - NE namesti ali razpakira arhivov\n" -#~ " -s izvede simulacijo ukaza.\n" -#~ " -y predpostavi y za vsa vprašanja in ne sprašuje\n" -#~ " -f poskuša popraviti sistem s pokvarjenimi odvisnostmi\n" -#~ " -m poskuša nadaljevati, če arhivov ni mogoče najti\n" -#~ " -u pokaže tudi seznam nadgrajenih paketov\n" -#~ " -b izgradi izvorni paket po njegovem pridobivanju\n" -#~ " -V pokaže podroben izpis števila različice\n" -#~ " -c=? prebere to nastavitveno datoteko\n" -#~ " -o=? nastavi poljubno nastavitveno možnost, na primer -0 dir::cache=/" -#~ "tmp\n" -#~ "Oglejte si strani apt-get(8), sources.list(5) in priročnik apt.conf(5)\n" -#~ " za več podrobnosti in možnosti.\n" -#~ " Ta APT ima moči Super Krav.\n" - -#~ msgid "" -#~ "Could not perform immediate configuration on '%s'.Please see man 5 apt." -#~ "conf under APT::Immediate-Configure for details. (%d)" -#~ msgstr "" -#~ "Ni mogoče izvesti takojšnje nastavitve na '%s'. Oglejte si man5 apt.conf " -#~ "pod APT::Takojšnja-nastavitev za podrobnosti. (%d)" - -#~ msgid "" -#~ "Could not perform immediate configuration on already unpacked '%s'.Please " -#~ "see man 5 apt.conf under APT::Immediate-Configure for details." +#~ "Could not perform immediate configuration on already unpacked '%s'. " +#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." #~ msgstr "" -#~ "Ni mogoče izvesti takojšnje nastavitve že razpakiranega '%s'. Oglejte si " +#~ "Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si " #~ "man 5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti" - -#~ msgid "" -#~ "Some index files failed to download, they have been ignored, or old ones " -#~ "used instead." -#~ msgstr "" -#~ "Nekaterih kazal ni mogoče prejeti, zato so prezrta, ali pa so uporabljena " -#~ "starejša." - -#~ msgid "Can't select versions from package '%s' as it purely virtual" -#~ msgstr "" -#~ "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen" @@ -3472,6 +3472,31 @@ msgstr "" msgid "Not locked" msgstr "Inte låst" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Användning: apt-extracttemplates fil1 [fil2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" +#~ "och mallinformation från paket\n" +#~ "\n" +#~ "Flaggor:\n" +#~ " -h Denna hjälptext.\n" +#~ " -t Ställ in temporärkatalogen.\n" +#~ " -c=? Läs denna konfigurationsfil.\n" +#~ " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/" +#~ "tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Misslyckades med att ta bort %s" @@ -3353,6 +3353,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "วิธีใช้: apt-extracttemplates file1 [file2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n" +#~ "ออกมาจากแพกเกจเดเบียน\n" +#~ "\n" +#~ "ตัวเลือก:\n" +#~ " -h แสดงข้อความช่วยเหลือนี้\n" +#~ " -t กำหนดไดเรกทอรีทำงานชั่วคราว\n" +#~ " -c=? อ่านแฟ้มค่าตั้งนี้\n" +#~ " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "ไม่สามารถลบ %s" @@ -3430,6 +3430,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" +#~ "\n" +#~ "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" +#~ "sa pagkaayos at template mula sa mga paketeng debian\n" +#~ "\n" +#~ "Mga opsyon:\n" +#~ " -h Itong tulong na ito\n" +#~ " -t Itakda ang dir na pansamantala\n" +#~ " -c=? Basahin ang talaksang pagkaayos na ito\n" +#~ " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Bigo sa pagtanggal ng %s" @@ -3441,6 +3441,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Використання: apt-extracttemplates file1 [file2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" +#~ "і файли-шаблони\n" +#~ "\n" +#~ "Опції:\n" +#~ " -h Цей текст\n" +#~ " -t Встановити теку для тимчасових файлів\n" +#~ " -c=? Читати зазначений конфігураційний файл\n" +#~ " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "Невдача видалення %s" @@ -3476,6 +3476,35 @@ msgstr "" msgid "Not locked" msgstr "Không phải bị khoá" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +#~ "\n" +#~ "[extract: \t\trút;\n" +#~ "templates: \tnhững biểu mẫu]\n" +#~ "\n" +#~ "apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +#~ "\tvà biểu mẫu đều từ gói Debian\n" +#~ "\n" +#~ "Tùy chọn:\n" +#~ " -h \t\t_Trợ giúp_ này\n" +#~ " -t \t\tLập thư muc tạm thời\n" +#~ "\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n" +#~ " -c=? \t\tĐọc tập tin cấu hình này\n" +#~ " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp " +#~ "»\n" + #~ msgid "Failed to remove %s" #~ msgstr "Việc gỡ bỏ %s bị lỗi" diff --git a/po/zh_CN.po b/po/zh_CN.po index 126829e77..f5bbae1fd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3367,6 +3367,30 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n" +#~ "\n" +#~ "apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" +#~ "信息的工具\n" +#~ "\n" +#~ "选项：\n" +#~ " -h 本帮助文本\n" +#~ " -t 设置 temp 目录\n" +#~ " -c=? 读指定的配置文件\n" +#~ " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "无法卸载 %s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5eea15299..0c66dec64 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3352,6 +3352,30 @@ msgstr "" msgid "Not locked" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Usage: apt-internal-solver\n" +#~ "\n" +#~ "apt-internal-solver is an interface to use the current internal\n" +#~ "like an external resolver for the APT family for debugging or alike\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ msgstr "" +#~ "用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" +#~ "\n" +#~ "apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" +#~ "的工具\n" +#~ "\n" +#~ "選項\n" +#~ " -h 本幫助訊息。\n" +#~ " -t 指定暫存目錄\n" +#~ " -c=? 讀取指定的設定檔\n" +#~ " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" + #~ msgid "Failed to remove %s" #~ msgstr "無法移除 %s" diff --git a/test/Makefile b/test/Makefile index 8207ebdab..74bffccb7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -7,7 +7,7 @@ ifndef NOISY endif .PHONY: startup headers library clean veryclean all binary program doc test update-po -startup all clean veryclean binary program dirs test update-po manpages: +startup all clean veryclean binary program dirs test update-po manpages debiandoc: $(MAKE) -C libapt $@ $(MAKE) -C interactive-helper $@ diff --git a/test/integration/framework b/test/integration/framework index dba8c0162..2d6ada117 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -304,23 +304,28 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME} Section: $SECTION Priority: $PRIORITY Maintainer: Joe Sixpack <joe@example.org> -Standards-Version: 3.9.1 +Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control + local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')" + test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control + echo " +Package: $NAME" >> ${BUILDDIR}/debian/control -Package: $NAME" > ${BUILDDIR}/debian/control if [ "$ARCH" = 'all' ]; then echo "Architecture: all" >> ${BUILDDIR}/debian/control else echo "Architecture: any" >> ${BUILDDIR}/debian/control fi - test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> ${BUILDDIR}/debian/control + local DEPS="$(echo "$DEPENDENCIES" | grep -v '^Build-')" + test -z "$DEPS" || echo "$DEPS" >> ${BUILDDIR}/debian/control if [ -z "$DESCRIPTION" ]; then echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, YOU did something horribly wrong! They are autogenerated und used only by testcases for APT and surf no other propose…" >> ${BUILDDIR}/debian/control else - echo "Description: $DESCRIPTION" >> ${BUILDIR}/debian/control + echo "Description: $DESCRIPTION" >> ${BUILDDIR}/debian/control fi + echo '3.0 (native)' > ${BUILDDIR}/debian/source/format local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')" for SRC in $SRCS; do diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index 4edb7c173..b164f7dba 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -9,6 +9,7 @@ configarchitecture "i386" buildsimplenativepackage 'apt' 'all' '1.0' 'stable' buildsimplenativepackage 'apt' 'all' '2.0' 'unstable' +insertinstalledpackage 'vrms' 'all' '1.0' setupaptarchive @@ -26,3 +27,6 @@ testdownload apt_2.0_all.deb apt DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb" testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sha256sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris + +# deb:677887 +testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing new file mode 100755 index 000000000..8f365dd55 --- /dev/null +++ b/test/integration/test-architecture-specification-parsing @@ -0,0 +1,96 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +buildsimplenativepackage 'pkg-arch-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !amd64] +Depends: foo [amd64 !amd64]' +buildsimplenativepackage 'pkg-arch-no-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!amd64 amd64] +Depends: foo [!amd64 amd64]' +buildsimplenativepackage 'pkg-arch-foo-unrelated-no' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!kfreebsd-any amd64] +Depends: foo [!kfreebsd-any amd64]' +buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !kfreebsd-any] +Depends: foo [amd64 !kfreebsd-any]' + +buildsimplenativepackage 'foo' 'amd64' '1.0' 'stable' + +insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + foo pkg-arch-foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Inst pkg-arch-foo (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64]) +Conf pkg-arch-foo (1.0 stable [amd64])' aptget install pkg-arch-foo -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + pkg-arch-no-foo +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst pkg-arch-no-foo (1.0 stable [amd64]) +Conf pkg-arch-no-foo (1.0 stable [amd64])' aptget install pkg-arch-no-foo -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + foo pkg-arch-foo-unrelated-no +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Inst pkg-arch-foo-unrelated-no (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64]) +Conf pkg-arch-foo-unrelated-no (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + foo pkg-arch-foo-unrelated-no2 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Inst pkg-arch-foo-unrelated-no2 (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64]) +Conf pkg-arch-foo-unrelated-no2 (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo -s + +testequal 'Reading package lists... +Building dependency tree... +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + foo +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 stable [amd64]) +Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no2 -s + + diff --git a/test/integration/test-673536-pre-depends-breaks-loop b/test/integration/test-bug-673536-pre-depends-breaks-loop index e9d3c4de6..e9d3c4de6 100755 --- a/test/integration/test-673536-pre-depends-breaks-loop +++ b/test/integration/test-bug-673536-pre-depends-breaks-loop diff --git a/test/integration/test-bug-675449-essential-are-protected b/test/integration/test-bug-675449-essential-are-protected new file mode 100755 index 000000000..7d8cc3484 --- /dev/null +++ b/test/integration/test-bug-675449-essential-are-protected @@ -0,0 +1,88 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertinstalledpackage 'pkg-native' 'amd64' '1' 'Multi-Arch: foreign +Essential: yes' +insertinstalledpackage 'pkg-foreign' 'i386' '1' 'Multi-Arch: foreign +Essential: yes' +insertinstalledpackage 'pkg-none-native' 'amd64' '1' 'Essential: yes' +insertinstalledpackage 'pkg-none-foreign' 'i386' '1' 'Essential: yes' + +insertpackage 'unstable' 'pkg-native' 'amd64,i386' '2' 'Multi-Arch: foreign +Essential: yes' +insertpackage 'unstable' 'pkg-foreign' 'amd64,i386' '2' 'Multi-Arch: foreign +Depends: pkg-depends-new +Essential: yes' +insertpackage 'unstable' 'pkg-none-native' 'amd64,i386' '2' 'Essential: yes' +insertpackage 'unstable' 'pkg-none-foreign' 'amd64,i386' '2' 'Essential: yes +Depends: pkg-depends-new' + +insertpackage 'unstable' 'pkg-none-new' 'amd64,i386' '2' 'Essential: yes' +insertpackage 'unstable' 'pkg-depends-new' 'amd64,i386' '2' 'Essential: yes' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + pkg-native* +WARNING: The following essential packages will be removed. +This should NOT be done unless you know exactly what you are doing! + pkg-native +0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. +Purg pkg-native [1]' aptget purge pkg-native -s + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + pkg-foreign:i386* +WARNING: The following essential packages will be removed. +This should NOT be done unless you know exactly what you are doing! + pkg-foreign:i386 +0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. +Purg pkg-foreign:i386 [1]' aptget purge pkg-foreign:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + pkg-none-native* +WARNING: The following essential packages will be removed. +This should NOT be done unless you know exactly what you are doing! + pkg-none-native +0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. +Purg pkg-none-native [1]' aptget purge pkg-none-native -s + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + pkg-none-foreign:i386* +WARNING: The following essential packages will be removed. +This should NOT be done unless you know exactly what you are doing! + pkg-none-foreign:i386 +0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded. +Purg pkg-none-foreign:i386 [1]' aptget purge pkg-none-foreign:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + pkg-depends-new:i386 pkg-none-new +The following packages will be upgraded: + pkg-foreign:i386 pkg-native pkg-none-foreign:i386 pkg-none-native +4 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst pkg-depends-new:i386 (2 unstable [i386]) +Conf pkg-depends-new:i386 (2 unstable [i386]) +Inst pkg-foreign:i386 [1] (2 unstable [i386]) +Conf pkg-foreign:i386 (2 unstable [i386]) +Inst pkg-native [1] (2 unstable [amd64]) +Conf pkg-native (2 unstable [amd64]) +Inst pkg-none-foreign:i386 [1] (2 unstable [i386]) +Conf pkg-none-foreign:i386 (2 unstable [i386]) +Inst pkg-none-native [1] (2 unstable [amd64]) +Conf pkg-none-native (2 unstable [amd64]) +Inst pkg-none-new (2 unstable [amd64]) +Conf pkg-none-new (2 unstable [amd64])' aptget dist-upgrade -s diff --git a/test/integration/test-cachecontainer-architecture-specification b/test/integration/test-cachecontainer-architecture-specification new file mode 100755 index 000000000..174efb087 --- /dev/null +++ b/test/integration/test-cachecontainer-architecture-specification @@ -0,0 +1,87 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'armel' + +#insertinstalledpackage 'xserver-xorg-core' 'amd64' '2:1.7.6-2ubuntu7.10' +insertpackage 'unstable' 'libsame' 'armel,amd64' '1' 'Multi-Arch: same' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Conf libsame (1 unstable [amd64])' aptget -s install libsame +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame:armel +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libsame:armel (1 unstable [armel]) +Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Conf libsame (1 unstable [amd64])' aptget -s install libsame:amd64 +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame libsame:armel +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Inst libsame:armel (1 unstable [armel]) +Conf libsame (1 unstable [amd64]) +Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel libsame:amd64 +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame libsame:armel +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Inst libsame:armel (1 unstable [armel]) +Conf libsame (1 unstable [amd64]) +Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:* +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Conf libsame (1 unstable [amd64])' aptget -s install libsame:any +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame libsame:armel +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Inst libsame:armel (1 unstable [armel]) +Conf libsame (1 unstable [amd64]) +Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:a* +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Conf libsame (1 unstable [amd64])' aptget -s install libsame:linux-any +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libsame libsame:armel +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libsame (1 unstable [amd64]) +Inst libsame:armel (1 unstable [armel]) +Conf libsame (1 unstable [amd64]) +Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-* +testequal 'Reading package lists... +Building dependency tree... +E: Unable to locate package libsame' aptget -s install libsame:windows-any diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index b5d92d9d2..677b1c892 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -10,7 +10,7 @@ int main(int argc,char *argv[]) { unsigned int Null = 0; bool StripMultiArch = true; bool ParseArchFlags = false; - _config->Set("APT::Architecture","dsk"); + _config->Set("APT::Architecture","amd64"); const char* Depends = "debhelper:any (>= 5.0), " @@ -19,13 +19,13 @@ int main(int argc,char *argv[]) { "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), " "debiandoc-sgml, " "apt (>= 0.7.25), " - "not-for-me [ !dsk ], " - "only-for-me [ dsk ], " + "not-for-me [ !amd64 ], " + "only-for-me [ amd64 ], " "any-for-me [ any ], " "not-for-darwin [ !darwin-any ], " - "cpu-for-me [ any-dsk ], " + "cpu-for-me [ any-amd64 ], " "os-for-me [ linux-any ], " - "cpu-not-for-me [ any-amd64 ], " + "cpu-not-for-me [ any-armel ], " "os-not-for-me [ kfreebsd-any ], " "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " ; |