diff options
88 files changed, 8911 insertions, 8192 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index b62bdcae1..e06c30a57 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -19,6 +19,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/time.h> #include <errno.h> #include <unistd.h> #include <apti18n.h> @@ -95,11 +96,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd) /* Set the modification times. The only way it can fail is if someone has futzed with our file, which is intolerable :> */ - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Itm.MTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(Fd, times) != 0) - _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm.Name, times) != 0) + _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name); if (close(Fd) != 0) return _error->Errno("close",_("Failed to close file %s"),Itm.Name); diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1185908f3..60003c023 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -757,6 +757,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has { // remove the just applied patch available_patches.erase(available_patches.begin()); + unlink((FinalFile + ".ed").c_str()); // move into place if(Debug) @@ -887,6 +888,14 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M // otherwise lists cleanup will eat the file DestFile = FinalFile; + // ensure the ed's are gone regardless of list-cleanup + for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin(); + I != allPatches->end(); ++I) + { + std::string patch = FinalFile + ".ed." + (*I)->patch.file + ".gz"; + unlink(patch.c_str()); + } + // all set and done Complete = true; if(Debug) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a5668a50a..3ae1e8b1d 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -561,45 +561,65 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source) return true; } /*}}}*/ -bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/ { - stringstream msg; - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); + CDROM = _config->FindDir("Acquire::cdrom::mount"); if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"), - CDROM.c_str()); - log->Update(msg.str()); + string msg; + log->SetTotal(STEP_LAST); + strprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); + log->Update(msg, STEP_PREPARE); + } + + // Unmount the CD and get the user to put in the one they want + if (_config->FindB("APT::CDROM::NoMount", false) == false) + { + if(log != NULL) + log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); + UnmountCdrom(CDROM); + + if(log != NULL) + { + log->Update(_("Waiting for disc...\n"), STEP_WAIT); + if(!log->ChangeCdrom()) { + // user aborted + return false; + } + } + + // Mount the new CDROM + if(log != NULL) + log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); + + if (MountCdrom(CDROM) == false) + return _error->Error("Failed to mount the cdrom."); } - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); // Hash the CD to get an ID if (log != NULL) - log->Update(_("Identifying.. ")); - + log->Update(_("Identifying.. "), STEP_IDENT); if (IdentCdrom(CDROM,ident) == false) { ident = ""; + if (log != NULL) + log->Update("\n"); return false; } if (log != NULL) { - msg.str(""); - ioprintf(msg, "[%s]\n",ident.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, "[%s]\n", ident.c_str()); + log->Update(msg); } // Read the database - Configuration Database; string DFile = _config->FindFile("Dir::State::cdroms"); if (FileExists(DFile) == true) { @@ -607,12 +627,22 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ return _error->Error("Unable to read the cdrom database %s", DFile.c_str()); } + return true; +} + /*}}}*/ +bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +{ + Configuration Database; + std::string CDROM; + if (MountAndIdentCDROM(Database, CDROM, ident, log) == false) + return false; + if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Stored label: %s\n"), - Database.Find("CD::"+ident).c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Stored label: %s\n"), + Database.Find("CD::"+ident).c_str()); + log->Update(msg); } // Unmount and finish @@ -628,70 +658,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ /*}}}*/ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ { - stringstream msg; - - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); - if (CDROM[0] == '.') - CDROM= SafeGetCWD() + '/' + CDROM; - - if(log != NULL) - { - log->SetTotal(STEP_LAST); - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); - log->Update(msg.str(), STEP_PREPARE); - } - - // Read the database Configuration Database; - string DFile = _config->FindFile("Dir::State::cdroms"); - if (FileExists(DFile) == true) - { - if (ReadConfigFile(Database,DFile) == false) - return _error->Error("Unable to read the cdrom database %s", - DFile.c_str()); - } - - // Unmount the CD and get the user to put in the one they want - if (_config->FindB("APT::CDROM::NoMount",false) == false) - { - if(log != NULL) - log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); - UnmountCdrom(CDROM); - - if(log != NULL) - { - log->Update(_("Waiting for disc...\n"), STEP_WAIT); - if(!log->ChangeCdrom()) { - // user aborted - return false; - } - } - - // Mount the new CDROM - if(log != NULL) - log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); - - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); - } - - // Hash the CD to get an ID - if(log != NULL) - log->Update(_("Identifying.. "), STEP_IDENT); - string ID; - if (IdentCdrom(CDROM,ID) == false) - { - if (log != NULL) - log->Update("\n"); + std::string ID, CDROM; + if (MountAndIdentCDROM(Database, CDROM, ID, log) == false) return false; - } + if(log != NULL) - { - log->Update("["+ID+"]\n"); log->Update(_("Scanning disc for index files..\n"),STEP_SCAN); - } // Get the CD structure vector<string> List; @@ -740,12 +713,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if (_config->FindB("APT::CDROM::DropTranslation", true) == true) DropTranslation(TransList); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + string msg; + strprintf(msg, _("Found %zu package indexes, %zu source indexes, " "%zu translation indexes and %zu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); - log->Update(msg.str(), STEP_SCAN); + log->Update(msg, STEP_SCAN); } if (List.empty() == true && SourceList.empty() == true) @@ -778,9 +751,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found label '%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Found label '%s'\n"), Name.c_str()); + log->Update(msg); } Database.Set("CD::" + ID + "::Label",Name); } @@ -824,9 +797,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ Database.Set("CD::" + ID,Name); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); + log->Update(msg); log->Update(_("Copying package lists..."), STEP_COPY); } @@ -884,7 +857,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); @@ -902,7 +875,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ } if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 7d19eb813..db637b96d 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -69,6 +69,10 @@ class pkgCdrom /*{{{*/ public: bool Ident(std::string &ident, pkgCdromStatus *log); bool Add(pkgCdromStatus *log); + + private: + bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, + std::string &ident, pkgCdromStatus * const log); }; /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 37155b688..71ac9c73f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1594,11 +1594,17 @@ unsigned long long FileFd::Tell() unsigned long long FileFd::FileSize() { struct stat Buf; - if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - return FileFdErrno("fstat","Unable to determine the file size"); + + bool ispipe = (d != NULL && d->pipe == true); + if (ispipe == false) + { + if (fstat(iFd,&Buf) != 0) + return FileFdErrno("fstat","Unable to determine the file size"); + ispipe = S_ISFIFO(Buf.st_mode); + } // for compressor pipes st_size is undefined and at 'best' zero - if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) + if (ispipe == true) { // we set it here, too, as we get the info here for free // in theory the Open-methods should take care of it already diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 5d2a67f4f..a8fb465bb 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -30,7 +30,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser public: - virtual bool Restart() {return Tags.Jump(Sect,0);}; + virtual bool Restart() {return Jump(0);}; virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);}; virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; @@ -50,8 +50,8 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Files(std::vector<pkgSrcRecords::File> &F); debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) - : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), - Buffer(NULL) {} + : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), + iOffset(0), Buffer(NULL) {} virtual ~debSrcRecordParser(); }; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index f9c891c86..c39e8c628 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1134,8 +1134,13 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl; if (Start.IsCritical() == false) continue; - // if the dependency was critical, we can't install it, so remove it again - MarkDelete(Pkg,false,Depth + 1, false); + // if the dependency was critical, we have absolutely no chance to install it, + // so if it wasn't installed remove it again. If it was, discard the candidate + // as the problemresolver will trip over it otherwise trying to install it (#735967) + if (Pkg->CurrentVer == 0) + MarkDelete(Pkg,false,Depth + 1, false); + else + SetCandidateVersion(Pkg.CurrentVer()); return false; } @@ -1253,6 +1258,11 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (PkgState[Pkg->ID].InstallVer == 0) continue; + /* Ignore negative dependencies that we are not going to + get installed */ + if (PkgState[Pkg->ID].InstallVer != *I) + continue; + if ((Start->Version != 0 || TrgPkg != Pkg) && PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer && PkgState[Pkg->ID].CandidateVer != *I && diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 81b601a7f..6ab5ec42d 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -92,7 +92,7 @@ bool pkgInitConfig(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0) + if (Cfg != 0 && strlen(Cfg) != 0) { if (RealFileExists(Cfg) == true) Res &= ReadConfigFile(Cnf,Cfg); diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 297559957..60b62850a 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -70,8 +70,9 @@ bool pkgSrcRecords::Restart() Current = Files.begin(); for (std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I) - (*I)->Restart(); - + if ((*I)->Offset() != 0) + (*I)->Restart(); + return true; } /*}}}*/ diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index b92b2c15a..832a40d1e 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -207,7 +207,11 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset) unsigned long long Dist = Offset - d->iOffset; d->Start += Dist; d->iOffset += Dist; - return Step(Tag); + // if we have seen the end, don't ask for more + if (d->Done == true) + return Tag.Scan(d->Start, d->End - d->Start); + else + return Step(Tag); } // Reposition and reload.. diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 17a60ddcb..20c6e8892 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -111,10 +111,12 @@ OpProgress* pkgCdromTextStatus::GetOpProgress() }; /*}}}*/ // SetupAutoDetect /*{{{*/ -bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) +bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) { bool Debug = _config->FindB("Debug::Acquire::cdrom", false); + automounted = false; + vector<struct CdromDevice> v = UdevCdroms.Scan(); if (i >= v.size()) return false; @@ -137,6 +139,8 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) mkdir(AptMountPoint.c_str(), 0750); if(MountCdrom(AptMountPoint, v[i].DeviceName) == false) _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str()); + else + automounted = true; _config->Set("Acquire::cdrom::mount", AptMountPoint); _config->Set("APT::CDROM::NoMount", true); } @@ -160,17 +164,35 @@ bool DoAdd(CommandLine &) bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Add(&log); - if (count == 0) { - res = cdrom.Add(&log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Add(&log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } - if(res) + if (count == 0) + res = cdrom.Add(&log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + else cout << _("Repeat this process for the rest of the CDs in your set.") << endl; return res; @@ -187,18 +209,38 @@ bool DoIdent(CommandLine &) pkgCdrom cdrom; bool res = true; - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect"); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Ident(ident, &log); - if (count == 0) { - res = cdrom.Ident(ident, &log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Ident(ident, &log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } + + if (count == 0) + res = cdrom.Ident(ident, &log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + return res; } /*}}}*/ diff --git a/configure.ac b/configure.ac index 2c306d10f..a49c9a479 100644 --- a/configure.ac +++ b/configure.ac @@ -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.15" +PACKAGE_VERSION="0.9.15.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 e915246e2..40085985f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +apt (0.9.15.1) unstable; urgency=medium + + [ David Kalnischkies ] + * use gpg --homedir instead of explicit file placement + * use svg in doxygen and ensure dot is around for it + * pkgTagFile: if we have seen the end, do not try to see more + * restart debSrcRecordParsers only if needed + * discard impossible candidates in MarkInstall (Closes: #735967) + + [ Chris Leick ] + * update german manpage translation + * Trivian unfuzzies of the German po4a translation + + [ Michael Vogt ] + * fix apt-get download truncation (closes: #736962) + * do not crash if VF.File()/VF.File().Archive() is NULL + * show "status" in apt list last to be more awk friendly + (thanks to Axel Beckert) + * Fix multiarch package upgrade issue + * add test for Suite with path + + [ Colin Watson ] + * multicompress with externals sets wrong file modes (Closes: 737130) + + -- Michael Vogt <mvo@debian.org> Thu, 06 Feb 2014 18:09:19 +0100 + apt (0.9.15) unstable; urgency=low * upload version from debian/experimental to unstable diff --git a/debian/control b/debian/control index f3303e891..0c1341bb9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index af43a7b07..3236d227a 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1459,7 +1459,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1 @@ -1483,7 +1482,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1 @@ -1512,6 +1510,23 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::staticSIGWINCH(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2 +### client-side merged pdiffs + (c++)"pkgAcqIndexMergeDiffs::DescURI()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&, DiffInfo const&, std::vector<pkgAcqIndexMergeDiffs*, std::allocator<pkgAcqIndexMergeDiffs*> > const*)@Base" 0.9.14.3~exp1 + (c++)"typeinfo for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"typeinfo name for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"vtable for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 +### deb822 sources.list format + (c++)"pkgSourceList::ParseFileDeb822(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::Type::ParseStanza(std::vector<metaIndex*, std::allocator<metaIndex*> >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1 ### mixed stuff (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 @@ -1570,6 +1585,8 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::FromFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13.1 (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 + (c++)"GetTempDir()@Base" 0.9.14.2 + (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.9.15.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 9ebbd9673..306bab1dc 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -613,7 +613,7 @@ WARNINGS = YES # for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2b5a6fd47..a96c84d3a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15"> +<!ENTITY apt-product-version "0.9.15.1"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 8153f70a5..36aa51ff9 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.15\n" +"Project-Id-Version: apt-doc 0.9.15.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\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" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/de.po b/doc/po/de.po index 883aa49a8..6914f6fdc 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-24 12:29+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2014-01-26 15:26+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -6789,8 +6789,8 @@ msgstr "" "müssen die Komponenten weggelassen werden und <literal>Suite</literal> muss " "mit einem Schrägstrich (<literal>/</literal>) enden. Dies ist nützlich, wenn " "nur ein bestimmter Unterabschnitt des von der URI angegebenen Archivs von " -"Interesse ist. Wenn <literal>Suite</literal> keinen genauen Pfad angibt, muss " -"mindestens eine <literal>Komponente</literal> angegeben sein." +"Interesse ist. Wenn <literal>Suite</literal> keinen genauen Pfad angibt, " +"muss mindestens eine <literal>Komponente</literal> angegeben sein." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:114 @@ -6803,14 +6803,14 @@ msgid "" "<literal>APT</literal> will automatically generate a URI with the current " "architecture otherwise." msgstr "" -"<literal>Suite</literal> könnte außerdem eine Variable, " -"<literal>$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " -"<literal>amd64</literal> oder <literal>armel</literal>) expandiert wird, die " -"auf dem System benutzt wird. Dies erlaubt es, architekturunabhängige " -"<filename>sources.list</filename>-Dateien zu benutzen. Im Allgemeinen ist " -"dies nur von Interesse, wenn ein genauer Pfad angegeben wird, andernfalls " -"wird <literal>APT</literal> automatisch eine URI mit der aktuellen " -"Architektur generieren." +"<literal>Suite</literal> könnte außerdem eine Variable, <literal>$(ARCH)</" +"literal>, enthalten, die zur Debian-Architektur (wie <literal>amd64</" +"literal> oder <literal>armel</literal>) expandiert wird, die auf dem System " +"benutzt wird. Dies erlaubt es, architekturunabhängige <filename>sources." +"list</filename>-Dateien zu benutzen. Im Allgemeinen ist dies nur von " +"Interesse, wenn ein genauer Pfad angegeben wird, andernfalls wird " +"<literal>APT</literal> automatisch eine URI mit der aktuellen Architektur " +"generieren." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 @@ -6833,12 +6833,12 @@ msgstr "" "oder Komponenten von diesem Ort gewünscht wird. APT wird die URI-Liste " "sortieren, nachdem es intern eine komplette Zusammenstellung generiert hat " "und es wird mehrere Bezüge zum gleichen Internet-Rechner zusammenfassen, zum " -"Beispiel zu einer einzigen Verbindung, so dass es nicht ineffizient " -"FTP-Verbindungen herstellt, sie schließt, sonst etwas tut und dann erneut " -"eine Verbindung zum gleichen Rechner herstellt. Diese Funktion ist nützlich " -"für den Zugriff auf ausgelastete FTP-Sites mit Begrenzungen der Anzahl " -"gleichzeitiger anonymer Anwender. APT parallelisiert außerdem Verbindungen zu " -"verschiedenen Rechnern, um effektiver mit Orten niedriger Bandbreite " +"Beispiel zu einer einzigen Verbindung, so dass es nicht ineffizient FTP-" +"Verbindungen herstellt, sie schließt, sonst etwas tut und dann erneut eine " +"Verbindung zum gleichen Rechner herstellt. Diese Funktion ist nützlich für " +"den Zugriff auf ausgelastete FTP-Sites mit Begrenzungen der Anzahl " +"gleichzeitiger anonymer Anwender. APT parallelisiert außerdem Verbindungen " +"zu verschiedenen Rechnern, um effektiver mit Orten niedriger Bandbreite " "hauszuhalten." #. type: Content of: <refentry><refsect1><para> @@ -6876,7 +6876,7 @@ msgstr "" "heruntergeladen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: sources.list.5.xml:124 +#: sources.list.5.xml:146 msgid "" "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</" "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>," @@ -8739,6 +8739,15 @@ msgstr "" #. type: <p></p> #: guide.sgml:163 +#, fuzzy +#| msgid "" +#| "<prgn>apt-get</prgn> has several command line options that are detailed " +#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +#| "option is <tt>-d</tt> which does not install the fetched files. If the " +#| "system has to download a large number of package it would be undesired to " +#| "start installing them in case something goes wrong. When <tt>-d</tt> is " +#| "used the downloaded archives can be installed by simply running the " +#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " "its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " diff --git a/doc/po/es.po b/doc/po/es.po index 9d46fa676..6e277b452 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 9b9794129..11d4bfeb7 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/it.po b/doc/po/it.po index 7b4389e99..97fa23697 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index a67b0a1fd..57dad234e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index 657b5f785..b0311d96f 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index 768b1cae3..24d74f0e5 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <l10n@debianpt.org>\n" @@ -8670,7 +8670,7 @@ msgstr "" #| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 35e6d1c19..4c6f1bb5b 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 18:22+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " +"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 265fb1a80..1555d2f2d 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -24,6 +24,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <iostream> @@ -237,7 +238,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); + utimes(I->Output.c_str(), NULL); Changed = true; } } @@ -365,7 +366,7 @@ bool MultiCompress::Child(int const &FD) for (Files *I = Outputs; I != 0; I = I->Next) { // Set the correct file modes - fchmod(I->TmpFile.Fd(),Permissions); + chmod(I->TmpFile.Name().c_str(),Permissions); if (rename(I->TmpFile.Name().c_str(),I->Output.c_str()) != 0) _error->Errno("rename",_("Failed to rename %s to %s"), diff --git a/methods/copy.cc b/methods/copy.cc index 744cc2b51..f2a8f9ed8 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -18,6 +18,7 @@ #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <apti18n.h> /*}}}*/ @@ -70,18 +71,15 @@ bool CopyMethod::Fetch(FetchItem *Itm) } From.Close(); + To.Close(); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - To.Close(); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Res.Filename.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); diff --git a/methods/ftp.cc b/methods/ftp.cc index 2d05364d5..70bf4f607 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -954,11 +954,11 @@ void FtpMethod::SigTerm(int) _exit(100); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); @@ -1062,11 +1062,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail and delete the destfile // otherwise transient fail @@ -1081,11 +1081,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Res.Size = Fd.Size(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index ea8a26fd4..25bf64ddd 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -8,7 +8,6 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/gpgv.h> -#include <utime.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> diff --git a/methods/gzip.cc b/methods/gzip.cc index f1edb353b..a2844e969 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -18,6 +18,7 @@ #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <stdio.h> #include <errno.h> @@ -93,6 +94,8 @@ bool GzipMethod::Fetch(FetchItem *Itm) } From.Close(); + Res.Size = To.FileSize(); + To.Close(); if (Failed == true) return false; @@ -102,23 +105,14 @@ bool GzipMethod::Fetch(FetchItem *Itm) if (stat(Path.c_str(),&Buf) != 0) return _error->Errno("stat",_("Failed to stat")); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; - times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - Res.Size = To.FileSize(); - To.Close(); - - if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); + Res.LastModified = times[1].tv_sec = Buf.st_mtime; + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); // Return a Done response - Res.LastModified = Buf.st_mtime; Res.TakeHashes(Hash); URIDone(Res); diff --git a/methods/http.cc b/methods/http.cc index e1390afcb..96c4e3ca0 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -36,7 +36,6 @@ #include <sys/stat.h> #include <sys/time.h> -#include <utime.h> #include <unistd.h> #include <signal.h> #include <stdio.h> diff --git a/methods/https.cc b/methods/https.cc index e16e36339..146b2bfb8 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -404,11 +404,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified); if (Res.LastModified != -1) { - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Res.LastModified; times[1].tv_sec = Res.LastModified; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(File->Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(File->Name().c_str(), times); } else Res.LastModified = resultStat.st_mtime; diff --git a/methods/rred.cc b/methods/rred.cc index d17ab110d..fe7ef7322 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -20,12 +20,13 @@ #include <vector> #include <iterator> +#include <fcntl.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> -#include <utime.h> +#include <sys/time.h> #include <apti18n.h> @@ -37,11 +38,9 @@ class MemBlock { char *free; struct MemBlock *next; - MemBlock(size_t size) + MemBlock(size_t size) : size(size), next(NULL) { free = start = new char[size]; - size = size; - next = NULL; } size_t avail(void) { return size - (free - start); } @@ -157,7 +156,7 @@ class FileChanges { #ifdef POSDEBUG size_t cpos = 0; std::list<struct Change>::iterator x; - for (x = changes.begin(); x != where; x++) { + for (x = changes.begin(); x != where; ++x) { assert(x != changes.end()); cpos += x->offset + x->add_cnt; } @@ -208,7 +207,7 @@ class FileChanges { left(); } std::list<struct Change>::iterator next = where; - next++; + ++next; while (next != changes.end() && next->offset == 0) { where->del_cnt += next->del_cnt; @@ -221,7 +220,7 @@ class FileChanges { where->add_cnt = next->add_cnt; next = changes.erase(next); } else { - next++; + ++next; } } } @@ -261,7 +260,7 @@ class FileChanges { if (where != changes.end()) where->offset -= offset; changes.insert(where, Change(offset)); - where--; + --where; assert(pos_is_okay()); } @@ -284,26 +283,10 @@ class FileChanges { before.add_len -= where->add_len; changes.insert(where, before); - where--; + --where; assert(pos_is_okay()); } - size_t check_next_offset(size_t max) - { - assert(pos_is_okay()); - if (max > 0) - { - where++; - if (where != changes.end()) { - if (where->offset < max) - max = where->offset; - } - where--; - assert(pos_is_okay()); - } - return max; - } - void delete_lines(size_t cnt) { std::list<struct Change>::iterator x = where; @@ -317,7 +300,7 @@ class FileChanges { x->skip_lines(del); cnt -= del; - x++; + ++x; if (x == changes.end()) { del = cnt; } else { @@ -334,7 +317,7 @@ class FileChanges { void left(void) { assert(pos_is_okay()); - where--; + --where; pos -= where->offset + where->add_cnt; assert(pos_is_okay()); } @@ -342,7 +325,7 @@ class FileChanges { void right(void) { assert(pos_is_okay()); pos += where->offset + where->add_cnt; - where++; + ++where; assert(pos_is_okay()); } }; @@ -378,11 +361,10 @@ class Patch { static void dump_lines(FILE *o, FILE *i, size_t n, Hashes *hash) { char buffer[BLOCK_SIZE]; - size_t l; while (n > 0) { if (fgets(buffer, sizeof(buffer), i) == 0) buffer[0] = '\0'; - l = strlen(buffer); + size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; retry_fwrite(buffer, l, o, hash); @@ -392,11 +374,10 @@ class Patch { static void skip_lines(FILE *i, int n) { char buffer[BLOCK_SIZE]; - size_t l; while (n > 0) { if (fgets(buffer, sizeof(buffer), i) == 0) buffer[0] = '\0'; - l = strlen(buffer); + size_t const l = strlen(buffer); if (l == 0 || buffer[l-1] == '\n') n--; } @@ -490,14 +471,14 @@ class Patch { { size_t line = 0; std::list<struct Change>::reverse_iterator ch; - for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { line += ch->offset + ch->del_cnt; } - for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) { + for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) { std::list<struct Change>::reverse_iterator mg_i, mg_e = ch; while (ch->del_cnt == 0 && ch->offset == 0) - ch++; + ++ch; line -= ch->del_cnt; if (ch->add_cnt > 0) { if (ch->del_cnt == 0) { @@ -526,7 +507,7 @@ class Patch { void apply_against_file(FILE *out, FILE *in, Hashes *hash = NULL) { std::list<struct Change>::iterator ch; - for (ch = filechanges.begin(); ch != filechanges.end(); ch++) { + for (ch = filechanges.begin(); ch != filechanges.end(); ++ch) { dump_lines(out, in, ch->offset, hash); skip_lines(in, ch->del_cnt); dump_mem(out, ch->add, ch->add_len, hash); @@ -575,7 +556,7 @@ class RredMethod : public pkgAcqMethod { std::string patch_name; for (std::vector<std::string>::iterator I = patchpaths.begin(); I != patchpaths.end(); - I++) + ++I) { patch_name = *I; if (Debug == true) @@ -617,11 +598,12 @@ class RredMethod : public pkgAcqMethod { stat(patch_name.c_str(), &bufpatch) != 0) return _error->Errno("stat", _("Failed to stat")); - struct utimbuf timebuf; - timebuf.actime = bufbase.st_atime; - timebuf.modtime = bufpatch.st_mtime; - if (utime(Itm->DestFile.c_str(), &timebuf) != 0) - return _error->Errno("utime", _("Failed to set modification time")); + struct timeval times[2]; + times[0].tv_sec = bufbase.st_atime; + times[1].tv_sec = bufpatch.st_mtime; + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(), &bufbase) != 0) return _error->Errno("stat", _("Failed to stat")); @@ -635,7 +617,7 @@ class RredMethod : public pkgAcqMethod { } public: - RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig) {} + RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig), Debug(false) {} }; int main(int argc, char **argv) diff --git a/methods/rsh.cc b/methods/rsh.cc index a441220bf..4e1aaea26 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -396,11 +396,11 @@ void RSHMethod::SigTerm(int sig) _exit(100); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -488,11 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail otherwise transient fail if (Missing == true) @@ -502,11 +502,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) } Res.Size = Fd.Size(); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/server.cc b/methods/server.cc index e12c23c07..76faa7e7f 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -369,11 +369,11 @@ void ServerMethod::SigTerm(int) if (FailFd == -1) _exit(100); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -539,10 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Server->Date; - times[0].tv_nsec = times[1].tv_nsec = 0; - utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Queue->DestFile.c_str(), times); // Send status to APT if (Result == true) @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -117,7 +117,7 @@ msgstr "يجب أن تعطي صيغة واحدة بالضبط" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -305,23 +305,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -329,151 +329,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -546,7 +546,7 @@ msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -639,16 +639,16 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -657,34 +657,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "تسجيل الدخول" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "رفض الخادم اتصالنا بالرد: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "فشل USER، ردّ الخادم: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "فشل PASS، ردّ الخادم: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -692,121 +692,121 @@ msgstr "" "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " "فارغ." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "فشل TYPE، ردّ الخادم: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "انتهى وقت الاتصال" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "خطأ في القراءة" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "خطأ في الكتابة" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "فشل" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "تعذر إرسال الأمر PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "فشل EPRT، ردّ الخادم: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "فشل نقل البيانات، ردّ الخادم '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "استعلام" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -872,70 +872,70 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" @@ -971,11 +971,11 @@ msgstr "نسق تاريخ مجهول" msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "خطأ داخلي" @@ -1212,101 +1212,108 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟" msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [مُثبّتة]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1314,27 +1321,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1343,7 +1350,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1351,21 +1358,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1423,10 +1430,6 @@ msgstr "تمّ" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1537,11 +1540,11 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1808,29 +1811,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "تعذر فتح %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1860,20 +1870,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" @@ -1987,12 +1997,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" @@ -2105,14 +2115,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2508,7 +2518,7 @@ msgstr "فشلت كتابة الملف %s" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3008,49 +3018,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3095,12 +3105,12 @@ msgstr "" msgid "Installing %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "تهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "إزالة %s" @@ -3121,111 +3131,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "تعذرت الكتابة إلى %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -109,7 +109,7 @@ msgstr "Has de dar polo menos un patrón de gueta" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -348,16 +348,16 @@ msgstr "Error internu, l'iguador de problemes frañó coses" msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -366,7 +366,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -378,97 +378,97 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +511,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -652,7 +652,7 @@ msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" @@ -745,16 +745,16 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá." msgid "Disk not found." msgstr "Nun s'atopa'l discu." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -763,34 +763,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI malu, los URIS llocales nun pueden entamar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nun se pudo determinar el nome del par" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nun se pudo determinar el nome llocal" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El sirvidor refugó la conexón, y dixo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -798,121 +798,121 @@ msgstr "" "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::" "ProxyLogin ta baleru." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "La triba (TYPE) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Gandió'l tiempu de conexón" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Fallu de llectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una rempuesta revirtió'l buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Fallu d'escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nun se pudo crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nun se pudo coneutar un socket pasivu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nun pudo obtener un zócalu oyente" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nun se pudo enllazar con un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nun se pudo escuchar nel socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nun se pudo determinar el nome del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nun se pudo mandar la orde PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Direición de familia %u desconocida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló; el sirvidor dixo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Gandió'l tiempu de conexón col zócalu de datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Gandió'l tiempu del zócalu de datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nun se pudo invocar " @@ -978,37 +978,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1016,35 +1016,35 @@ msgstr "" "Les robles siguientes nun pudieron verificase porque la to llave pública nun " "ta a mano:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" @@ -1080,11 +1080,11 @@ msgstr "Formatu de data desconocíu" msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Fallu internu" @@ -1334,101 +1334,108 @@ msgstr "¿Instalar esos paquetes ensin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaláu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1443,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1465,7 +1472,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1473,21 +1480,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1545,10 +1552,6 @@ msgstr "Fecho" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1664,11 +1667,11 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexón encaboxada prematuramente" @@ -1990,31 +1993,38 @@ msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nun pudo allugase memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nun pudo abrise %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Saltu mal formáu %s llinia %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nun pudo lleese'l ficheru de saltos %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Saltu mal formáu %s llinia %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Saltu mal formáu %s llinia %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Saltu mal formáu %s llinia %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nun pudo lleese'l ficheru de saltos %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2042,20 +2052,20 @@ msgstr "Comprimir fíu" msgid "Internal error, failed to create %s" msgstr "Error internu, nun pudo criase %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Fallu na ES al soprocesu/ficheru" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Nun pudo lleese al computar MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" @@ -2192,12 +2202,12 @@ msgstr "Doble suma de desvíu %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ficheru de configuración duplicáu %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura nel ficheru %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" @@ -2309,7 +2319,7 @@ msgstr "" "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-" "Start. El valor actual ye : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2317,7 +2327,7 @@ msgid "" msgstr "" "Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2718,7 +2728,7 @@ msgstr "Falló la escritura del ficheru temporal d'estáu %s" msgid "Unable to parse package file %s (1)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" @@ -3244,33 +3254,33 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s" msgid "Hash mismatch for: %s" msgstr "El hash nun concasa pa: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nun pudo alcontrase la xera '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3279,21 +3289,21 @@ msgstr "" "Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' " "como non tien nengún d'ellos" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente " "virtual" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nun puede seleicionase versión candidata pal paquete %s que nun tien " "candidata" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3342,12 +3352,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Desinstalando %s" @@ -3368,87 +3378,87 @@ msgid "Running post-installation trigger %s" msgstr "Executando activador de post-instalación de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta'l direutoriu '%s'." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose pa configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instaláu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose pa desinstalar %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s desinstaláu" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose pa desinstalar dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nun se pue escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3456,7 +3466,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3464,7 +3474,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3472,7 +3482,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3481,7 +3491,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\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" @@ -115,7 +115,7 @@ msgstr "Трябва да въведете поне един шаблон за msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,16 +352,16 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -383,80 +383,80 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,18 +465,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -659,7 +659,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@ -772,16 +772,16 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -790,34 +790,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Влизане" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Неуспех при установяването на името на отдалечения сървър" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Неуспех при установяването на локалното име" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сървърът отказа свързване и съобщи: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER се провали, сървърът съобщи: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS се провали, сървърът съобщи: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -825,123 +825,123 @@ msgstr "" "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::" "ProxyLogin е празен." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE се провали, сървърът съобщи: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Допустимото време за свързването изтече" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Грешка при четене" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Отговорът препълни буфера." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Грешка при запис" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Неуспех при създаването на гнездо" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Неуспех при свързването на гнездо за данни, допустимото време за свързване " "изтече" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неуспех" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Неуспех при свързването на пасивно гнездо." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo не успя да се добере до слушащо гнездо" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Неуспех при свързването на гнездо" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Неуспех при слушането на гнездото" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Неуспех при определянето на името на гнездото" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Неуспех при изпращането на командата PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестно семейство адреси %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT се провали, сървърът съобщи: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Времето за установяване на връзка с гнездо за данни изтече" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Времето за връзка с гнездо за данни изтече" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Запитване" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Неуспех при извикването на " @@ -1007,40 +1007,40 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1048,35 +1048,35 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" @@ -1112,11 +1112,11 @@ msgstr "Неизвестен формат на дата" msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Вътрешна грешка" @@ -1368,101 +1368,108 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Инсталиран]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " или" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1477,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1499,7 +1506,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1507,21 +1514,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1581,10 +1588,6 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1699,11 +1702,11 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" @@ -2027,31 +2030,38 @@ msgstr " %s няма също и запис „binary override“\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправилно форматиран override %s, ред %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Неуспех при четенето на override файл %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправилно форматиран override %s, ред %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправилно форматиран override %s, ред %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправилно форматиран override %s, ред %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Неуспех при четенето на override файл %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2079,20 +2089,20 @@ msgstr "Процес-потомък за компресиране" msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" @@ -2227,12 +2237,12 @@ msgstr "Двойно добавяне на отклонение %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" @@ -2344,7 +2354,7 @@ msgstr "" "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-" "Start. Текуща стойност: %lu (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2353,7 +2363,7 @@ msgstr "" "Неуспех при увеличаване на паметта за MMap. Достигнато е текущото " "ограничение от %lu байта." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2757,7 +2767,7 @@ msgstr "Неуспех при запис на временен StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" @@ -3298,32 +3308,32 @@ msgstr "Не е намерен oторизационен запис за: %s" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума за: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Неуспех при намиране на задача „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3332,21 +3342,21 @@ msgstr "" "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " "понеже той няма нито едната" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не е възможно избиране на на последната версия за пакета „%s“, защото е " "виртуален" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " "подходящ кандидати" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3397,12 +3407,12 @@ msgstr "" msgid "Installing %s" msgstr "Инсталиране на %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Премахване на %s" @@ -3423,89 +3433,89 @@ msgid "Running post-installation trigger %s" msgstr "Изпълнение на тригер след инсталиране %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Директорията „%s“ липсва" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Неуспех при отваряне на файла „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неуспех при записа на %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3513,7 +3523,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3521,7 +3531,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3529,7 +3539,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3538,7 +3548,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -112,7 +112,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -311,23 +311,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -335,151 +335,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -552,7 +552,7 @@ msgstr "" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -645,16 +645,16 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -663,155 +663,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prijavljujem se" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Greška pri čitanju" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 #, fuzzy msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Greška pri pisanju" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Neuspješno" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -877,71 +877,71 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "" @@ -977,11 +977,11 @@ msgstr "Nepoznat oblik datuma" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1212,128 +1212,135 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[Instalirano]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1342,7 +1349,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1350,21 +1357,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1421,10 +1428,6 @@ msgstr "Urađeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1532,11 +1535,11 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1802,29 +1805,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1854,20 +1864,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1981,12 +1991,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2099,14 +2109,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2503,7 +2513,7 @@ msgstr "Ne mogu ukloniti %s" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3001,49 +3011,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3088,12 +3098,12 @@ msgstr "" msgid "Installing %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" @@ -3114,111 +3124,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ne mogu zapisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -353,16 +353,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,81 +384,81 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,18 +467,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -663,7 +663,7 @@ msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" @@ -756,16 +756,16 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -774,34 +774,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI no vàlid, els URI locals no han de començar per //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "S'està accedint a" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "No es pot determinar el nom de la màquina distant" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "No es pot determinar el nom local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -809,122 +809,122 @@ msgstr "" "S'ha especificat un servidor intermediari però no un script d'accés, " "Acquire::ftp::ProxyLogin està buit." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Temps de connexió finalitzat" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una resposta ha desbordat la memòria intermèdia." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error d'escriptura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "No s'ha pogut crear un sòcol" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ha fallat" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "No s'ha pogut connectar amb el sòcol passiu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte" # abastar? huh? jm -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "No s'ha pogut vincular a un connector" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "No s'ha pogut escoltar sobre el sòcol" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "No s'ha pogut determinar el nom del sòcol" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "No es pot enviar l'ordre PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "La família d'adreces %u és desconeguda (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "S'ha esgotat el temps de connexió al sòcol de dades" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "S'ha esgotat el temps d'espera per al sòcol de dades" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "No es pot invocar" @@ -990,40 +990,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar el «gpgv» per a verificar la signatura (està " "instaŀlat el gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1031,36 +1031,36 @@ msgstr "" "Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" @@ -1096,11 +1096,11 @@ msgstr "Format de la data desconegut" msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Error intern" @@ -1357,101 +1357,108 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaŀlat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1459,27 +1466,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1488,7 +1495,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1496,21 +1503,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1568,10 +1575,6 @@ msgstr "Fet" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1686,11 +1689,11 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" @@ -2011,31 +2014,38 @@ msgstr " %s no té una entrada dominant de binari\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "No es pot obrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Línia predominant %s malformada %llu núm 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Línia predominant %s malformada %llu núm 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Línia predominant %s malformada %llu núm 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Línia predominant %s malformada %llu núm 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2063,20 +2073,20 @@ msgstr "Comprimeix el fil" msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" @@ -2211,12 +2221,12 @@ msgstr "Afegit doble d'una desviació %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -2328,7 +2338,7 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-" "Start. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2337,7 +2347,7 @@ msgstr "" "No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja " "s'ha superat." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2741,7 +2751,7 @@ msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" @@ -3284,34 +3294,34 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s" msgid "Hash mismatch for: %s" msgstr "El resum no coincideix per a: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "No s'ha pogut trobar la tasca «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "No s'han pogut seleccionar les versions del paquet «%s» ja que és purament " "virtual" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3320,21 +3330,21 @@ msgstr "" "No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet " "«%s» ja que no estan disponibles cap de les dues" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és " "purament virtual" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té " "candidata" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3383,12 +3393,12 @@ msgstr "" msgid "Installing %s" msgstr "S'està instaŀlant %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "S'està suprimint el paquet %s" @@ -3409,87 +3419,87 @@ msgid "Running post-installation trigger %s" msgstr "S'està executant l'activador de postinstaŀlació %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Manca el directori «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "No s'ha pogut obrir el fitxer «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "S'ha instaŀlat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No es pot escriure en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3497,7 +3507,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3505,7 +3515,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3513,7 +3523,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3522,7 +3532,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -111,7 +111,7 @@ msgstr "Musíte zadat alespoň jeden vyhledávací vzor" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -344,16 +344,16 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci" msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -362,7 +362,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,80 +373,80 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -455,17 +455,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -474,20 +474,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,7 +496,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -505,30 +505,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -642,7 +642,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" @@ -754,16 +754,16 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá." msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -772,34 +772,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokální URI nesmí začínat na //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Přihlašuji se" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nelze určit jméno druhé strany" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nelze určit lokální jméno" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamítl naše spojení a řekl: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER selhal, server řekl: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS selhal, server řekl: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -807,121 +807,121 @@ msgstr "" "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin " "je prázdný." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE selhal, server řekl: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Čas spojení vypršel" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Chyba čtení" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpověď přeplnila buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba zápisu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nelze vytvořit socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nelze připojit datový socket, čas spojení vypršel" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Selhalo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nelze připojit pasivní socket." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal naslouchající socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nelze navázat socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nelze naslouchat na socketu" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nelze určit jméno socketu" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nelze odeslat příkaz PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznámá rodina adres %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT selhal, server řekl: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Spojení datového socketu vypršelo" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nelze stáhnout soubor, server řekl „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datový socket vypršel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Přenos dat selhal, server řekl „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nelze vyvolat " @@ -987,36 +987,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1024,35 +1024,35 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" @@ -1088,11 +1088,11 @@ msgstr "Neznámý formát data" msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vnitřní chyba" @@ -1346,101 +1346,108 @@ msgstr "Instalovat tyto balíky bez ověření?" msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[Instalovaný]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1448,27 +1455,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1477,7 +1484,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1485,21 +1492,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1557,10 +1564,6 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1676,11 +1679,11 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" @@ -1994,31 +1997,38 @@ msgstr " %s nemá ani žádnou binární položku pro override\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Zkomolený override soubor %s, řádek %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nezdařilo se přečíst override soubor %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Zkomolený override soubor %s, řádek %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Zkomolený override soubor %s, řádek %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nezdařilo se přečíst override soubor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2046,20 +2056,20 @@ msgstr "Komprimovat potomka" msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" @@ -2193,12 +2203,12 @@ msgstr "Dvojí přidání diverze %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@ -2310,14 +2320,14 @@ msgstr "" "Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. " "Současná hodnota: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2717,7 +2727,7 @@ msgstr "Nelze zapsat dočasný stavový soubor %s" msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -3240,32 +3250,32 @@ msgstr "Nelze najít autentizační záznam pro: %s" msgid "Hash mismatch for: %s" msgstr "Neshoda kontrolních součtů pro: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nelze najít úlohu „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3274,17 +3284,17 @@ msgstr "" "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " "žádné takové verze nemá" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován" @@ -3331,12 +3341,12 @@ msgstr "" msgid "Installing %s" msgstr "Instaluji %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" @@ -3357,88 +3367,88 @@ msgid "Running post-installation trigger %s" msgstr "Spouštím poinstalační spouštěč %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Adresář „%s“ chybí" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nelze otevřít soubor „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nelze zapsat do %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3446,7 +3456,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3454,7 +3464,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3462,7 +3472,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3471,7 +3481,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -126,7 +126,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" @@ -174,7 +174,7 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -371,23 +371,23 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -395,96 +395,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +493,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +502,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +518,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,32 +527,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -763,16 +763,16 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -781,34 +781,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,124 +817,124 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1000,72 +1000,72 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:533 +#: methods/http.cc:530 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1106,11 +1106,11 @@ msgstr "Fformat dyddiad anhysbys" msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Gwall mewnol" @@ -1359,104 +1359,111 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1466,27 +1473,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1495,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1503,21 +1510,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1576,10 +1583,6 @@ msgstr "Wedi Gorffen" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1690,11 +1693,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -2018,31 +2021,38 @@ msgstr " Does dim cofnod gwrthwneud gan %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" - #: ftparchive/multicompress.cc:70 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" @@ -2071,20 +2081,20 @@ msgstr "Plentyn Cywasgu" msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2224,12 +2234,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2346,14 +2356,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2762,7 +2772,7 @@ msgstr "Methwyd ysgrifennu ffeil %s" msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -3295,49 +3305,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3385,12 +3395,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3411,111 +3421,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2013-12-14 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -115,7 +115,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -356,16 +356,16 @@ msgstr "Intern fejl. Problemløseren ødelagde noget" msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -374,7 +374,7 @@ msgstr "" "BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -385,78 +385,78 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil »%s«\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken »dpkg-dev« er installeret.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +465,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -491,14 +491,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -507,7 +507,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -516,30 +516,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -654,7 +654,7 @@ msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" @@ -782,16 +782,16 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -800,34 +800,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI, lokale URI'er må ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logget på" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kunne ikke bestemme serverens navn" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kunne ikke bestemme det lokale navn" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serveren nægtede os forbindelse og sagde: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -835,121 +835,121 @@ msgstr "" "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::" "ProxyLogin er tom." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Læsefejl" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Mellemlageret blev overfyldt af et svar." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefejl" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kunne ikke oprette sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislykkedes" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kunne ikke forbinde passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunne ikke få en lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kunne ikke tilknytte en sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kunne ikke lytte på soklen" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kunne ikke finde soklens navn" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kunne ikke sende PORT-kommando" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukendt adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsudløb på datasokkel-forbindelse" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde »%s«" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Forespørgsel" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Kunne ikke udføre " @@ -1015,23 +1015,23 @@ msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1040,15 +1040,15 @@ msgstr "" "Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke " "autentificering?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1056,35 +1056,35 @@ msgstr "" "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " "tilgængelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" @@ -1121,11 +1121,11 @@ msgstr "Ukendt datoformat" msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern fejl" @@ -1376,98 +1376,105 @@ msgstr "Installér disse pakker uden verifikation?" msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:202 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, fuzzy, c-format +msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1475,27 +1482,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1504,7 +1511,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1512,21 +1519,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1583,10 +1590,6 @@ msgstr "Færdig" msgid "Full Text Search" msgstr "Fuldtekst-søgning" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1701,11 +1704,11 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" @@ -2026,31 +2029,38 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - Kunne ikke allokere hukommelse" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kunne ikke åbne %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig gennemtvangs %s-linje %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Kunne ikke læse gennemtvangsfilen %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig gennemtvangs %s-linje %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig gennemtvangs %s-linje %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Kunne ikke læse gennemtvangsfilen %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2078,20 +2088,20 @@ msgstr "Komprimer barn" msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Kunne ikke læse under beregning af MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" @@ -2226,12 +2236,12 @@ msgstr "Dobbelt tilføjelse af omrokering %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -2343,7 +2353,7 @@ msgstr "" "Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. " "Aktuel værdi: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2352,7 +2362,7 @@ msgstr "" "Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er " "nået." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2749,7 +2759,7 @@ msgstr "Kunne ikke skrive den midlertidige StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" @@ -3275,32 +3285,32 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsum stemmer ikke: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen »%s« for »%s« blev ikke fundet" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunne ikke finde opgaven »%s«" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3309,18 +3319,18 @@ msgstr "" "Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " "har nogen af dem" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3368,12 +3378,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Sætter %s op" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3394,88 +3404,88 @@ msgid "Running post-installation trigger %s" msgstr "Kører førinstallationsudløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mappe »%s« mangler" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kunne ikke åbne filen »%s«" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive log (%s)" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "Er /dev/pts monteret?" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "Er standardud en terminal?" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3483,14 +3493,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3498,7 +3508,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3506,7 +3516,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " "system" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\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" @@ -116,7 +116,7 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark " "showauto«." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -359,18 +359,18 @@ msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -380,7 +380,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -392,80 +392,80 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -474,18 +474,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +494,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +503,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +520,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,30 +529,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -675,7 +675,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" @@ -791,17 +791,17 @@ msgstr "" msgid "Disk not found." msgstr "Medium nicht gefunden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -810,34 +810,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Anmeldung läuft" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Name des Kommunikationspartners kann nicht bestimmt werden." -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Lokaler Name kann nicht bestimmt werden." -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Verbindung durch Server abgelehnt; Server meldet: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Befehl USER fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -845,123 +845,123 @@ msgstr "" "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::" "ProxyLogin ist leer." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Befehl TYPE fehlgeschlagen: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Zeitüberschreitung der Verbindung" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefehler" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schreibfehler" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Socket konnte nicht erzeugt werden." -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fehlgeschlagen" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Passiver Socket konnte nicht verbunden werden." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket " "gefunden." -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Verbindung des Sockets nicht möglich" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Warten auf Verbindungen auf dem Socket nicht möglich" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Name des Sockets konnte nicht bestimmt werden." -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT-Befehl konnte nicht gesendet werden." -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Unbekannte Adressfamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Befehl EPRT fehlgeschlagen: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Zeitüberschreitung bei Datenverbindung" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Abfrage" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Aufruf nicht möglich: " @@ -1029,40 +1029,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1071,37 +1071,37 @@ msgstr "" "öffentlicher\n" "Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" @@ -1140,11 +1140,11 @@ msgstr "Unbekanntes Datumsformat" msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Interner Fehler" @@ -1401,102 +1401,109 @@ msgstr "Diese Pakete ohne Überprüfung installieren?" msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installiert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1504,27 +1511,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1533,7 +1540,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1541,21 +1548,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1613,10 +1620,6 @@ msgstr "Fertig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1732,12 +1735,12 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" @@ -2065,31 +2068,38 @@ msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Speicheranforderung fehlgeschlagen" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s konnte nicht geöffnet werden." -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Missgestaltetes Override %s Zeile %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Override-Datei %s konnte nicht gelesen werden." + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Missgestaltetes Override %s Zeile %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Missgestaltetes Override %s Zeile %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Override-Datei %s konnte nicht gelesen werden." - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2117,20 +2127,20 @@ msgstr "Komprimierungs-Kindprozess" msgid "Internal error, failed to create %s" msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." @@ -2266,12 +2276,12 @@ msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Datei %s konnte nicht geschrieben werden." -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." @@ -2383,7 +2393,7 @@ msgstr "" "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::" "Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2392,7 +2402,7 @@ msgstr "" "Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits " "erreicht ist." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2802,7 +2812,7 @@ msgstr "Temporäres StateFile %s konnte nicht geschrieben werden." msgid "Unable to parse package file %s (1)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." @@ -3353,34 +3363,34 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" msgid "Hash mismatch for: %s" msgstr "Hash-Summe stimmt nicht überein für: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Task »%s« konnte nicht gefunden werden." -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein " "virtuell ist." -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3389,21 +3399,21 @@ msgstr "" "Es kann weder eine installierte Version noch ein Installationskandidat von " "Paket »%s« ausgewählt werden, da beide nicht existieren." -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein " "virtuell ist." -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein " "solcher existiert." -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3453,12 +3463,12 @@ msgstr "" msgid "Installing %s" msgstr "%s wird installiert." -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s wird konfiguriert." -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s wird entfernt." @@ -3479,89 +3489,89 @@ msgid "Running post-installation trigger %s" msgstr "Aufruf des Nach-Installations-Triggers %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Datei »%s« konnte nicht geöffnet werden." -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt." -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Vollständiges Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Schreiben nach %s nicht möglich" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3569,7 +3579,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3577,7 +3587,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3585,7 +3595,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3594,7 +3604,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -117,7 +117,7 @@ msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -356,23 +356,23 @@ msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མ msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -380,116 +380,116 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,37 +498,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, 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:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -644,7 +644,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" @@ -738,16 +738,16 @@ msgstr "" msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -756,34 +756,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་ ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "ནང་བསྐྱོད་འབད་དོ།" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -791,121 +791,121 @@ msgstr "" "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་ ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::" "ProxyLoginའདི་སྟོངམ་ཨིན་པས།" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "མཐུད་ལམ་ངལ་མཚམས" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མས།" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "འདྲི་དཔྱད།" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" @@ -971,75 +971,75 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" @@ -1075,11 +1075,11 @@ msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -1326,101 +1326,108 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1435,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1457,7 +1464,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1465,21 +1472,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1537,10 +1544,6 @@ msgstr "འབད་ཚར་ཡི།" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1651,11 +1654,11 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" @@ -1981,31 +1984,38 @@ msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནི msgid "realloc - Failed to allocate memory" msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2033,20 +2043,20 @@ msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2183,12 +2193,12 @@ msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2301,14 +2311,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2706,7 +2716,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" @@ -3223,49 +3233,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3313,12 +3323,12 @@ msgstr "" msgid "Installing %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" @@ -3339,111 +3349,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -122,7 +122,7 @@ msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" @@ -167,7 +167,7 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -364,25 +364,25 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -390,96 +390,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +488,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -656,7 +656,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" @@ -749,16 +749,16 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -767,34 +767,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Σύνδεση στο σύστημα" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -802,121 +802,121 @@ msgstr "" "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::" "ProxyLogin είναι άδειο" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Σφάλμα εγγραφής" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Απέτυχε" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Αδύνατη η αποστολή της εντολής PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Λήξη χρόνου υποδοχής δεδομένων" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Επερώτηση" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" @@ -982,18 +982,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -1001,22 +1001,22 @@ msgstr "" "εγκατεστημένο το gpgv;)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1024,36 +1024,36 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" @@ -1089,11 +1089,11 @@ msgstr "Άγνωστη μορφή ημερομηνίας" msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -1344,101 +1344,108 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Εγκατεστημένα]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " η" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1446,27 +1453,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1475,7 +1482,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1483,21 +1490,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1557,10 +1564,6 @@ msgstr "Ετοιμο" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1671,11 +1674,11 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" @@ -2001,31 +2004,38 @@ msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκ msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Αδύνατο το άνοιγμα του %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2053,20 +2063,20 @@ msgstr "Συμπίεση απογόνου" msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" @@ -2202,12 +2212,12 @@ msgstr "Διπλή προσθήκη εκτροπής %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" @@ -2320,14 +2330,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2729,7 +2739,7 @@ msgstr "Αποτυχία εγγραφής του αρχείου κατάστασ msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" @@ -3252,49 +3262,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3342,12 +3352,12 @@ msgstr "" msgid "Installing %s" msgstr "Εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" @@ -3368,111 +3378,111 @@ msgid "Running post-installation trigger %s" msgstr "Εκτέλεση του post-installation trigger %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος %s αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -167,7 +167,7 @@ msgstr "Debe proporcionar al menos un patrón de búsqueda" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" @@ -212,7 +212,7 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -411,16 +411,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -430,7 +430,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -442,97 +442,97 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -541,7 +541,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -550,14 +550,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -566,7 +566,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -575,30 +575,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -716,7 +716,7 @@ msgstr "%s ya está en su versión más reciente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" @@ -809,16 +809,16 @@ msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -827,34 +827,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, los URIS locales no deben de empezar con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Entrando" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "No pude determinar el nombre del par" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Imposible determinar el nombre local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "El servidor rechazó nuestra conexión y dijo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Usuario (USER) falló, el servidor dijo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Clave (PASS) falló, el servidor dijo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -862,121 +862,121 @@ msgstr "" "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::" "ProxyLogin» está vacío." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Tipo (TYPE) falló, el servidor dijo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "La conexión expiró" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "No pude crear un socket." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error de escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "No pude crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falló" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "No pude conectar un socket pasivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo no pude obtener un socket oyente" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "No pude ligar un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "No pude escuchar en el socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "No pude determinar el nombre del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "No pude mandar la orden PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Dirección de familia %u desconocida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló, el servidor dijo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Expiró conexión a socket de datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Imposible traer archivo, el servidor dijo «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Expiró el socket de datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló transferencia de datos, el servidor dijo «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "No pude invocar " @@ -1042,39 +1042,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella " "digital?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1082,35 +1082,35 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pública no " "está disponible:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" @@ -1146,11 +1146,11 @@ msgstr "Formato de fecha desconocido" msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Error interno" @@ -1408,101 +1408,108 @@ msgstr "¿Instalar estos paquetes sin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1510,27 +1517,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1539,7 +1546,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1547,21 +1554,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1619,10 +1626,6 @@ msgstr "Listo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1737,11 +1740,11 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" @@ -2068,31 +2071,38 @@ msgstr " %s tampoco tiene una entrada binaria predominante\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Predominio mal formado %s línea %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "No se pudo leer el archivo de predominio %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Predominio mal formado %s línea %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Predominio mal formado %s línea %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "No se pudo leer el archivo de predominio %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2120,20 +2130,20 @@ msgstr "Hijo compresión" msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" @@ -2271,12 +2281,12 @@ msgstr "Doble suma de desviación %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura del archivo %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -2388,7 +2398,7 @@ msgstr "" "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el " "valor de «APT::Cache-Start». El valor actual es: %lu (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2397,7 +2407,7 @@ msgstr "" "No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el " "límite de %lu bytes." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2801,7 +2811,7 @@ msgstr "Falló la escritura del fichero de estado temporal %s" msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" @@ -3342,34 +3352,34 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s" msgid "Hash mismatch for: %s" msgstr "La suma hash difiere para: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución «%s» para «%s»" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión «%s» para «%s»" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "No se pudo encontrar la tarea «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "No se pueden seleccionar distintas versiones del paquete «%s» porque es " "puramente virtual" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3378,21 +3388,21 @@ msgstr "" "No se puede seleccionar una versión instalada o candidata para el paquete " "«%s» dado que éste no tiene ninguna de éstas" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "No se puede seleccionar la última versión del paquete «%s» dado que es " "puramente virtual" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "No se puede seleccionar una versión candidata del paquete %s dado que no " "tiene candidatos" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3442,12 +3452,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Eliminando %s" @@ -3468,89 +3478,89 @@ msgid "Running post-installation trigger %s" msgstr "Ejecutando disparador post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio «%s»." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "No se puede escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3558,7 +3568,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3566,7 +3576,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3574,7 +3584,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3583,7 +3593,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -114,7 +114,7 @@ msgstr "Zehazki eredu bat eman behar duzu." msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,23 +352,23 @@ msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -376,97 +376,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -474,7 +474,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -482,14 +482,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,7 +498,7 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +506,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -643,7 +643,7 @@ msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" @@ -737,16 +737,16 @@ msgstr "" msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -755,34 +755,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Sartzen" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ezin izan da peer edo parekoaren izena zehaztu" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ezin izan da izen lokala zehaztu" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -790,124 +790,124 @@ msgstr "" "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::" "ProxyLogin hutsik dago." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan " "du: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Konexioa denboraz kanpo" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Irakurketa errorea" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Erantzun batek bufferrari gainez eragin dio." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Idazketa errorea" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Ezin izan da socket-a sortu" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Huts egin du" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Ezin izan da socket pasibora konektatu." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Ezin izan da socket bat lotu" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Ezin izan da socket-ean entzun" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Ezin izan da socket-aren izena zehaztu" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Ezin da PORT komandoa bidali" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Helbide familia ezezagunaa: %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Datu-socket konexioak denbora muga gainditu du" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datu-socketak denbora muga gainditu du" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Kontsulta" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Ezin da deitu " @@ -974,37 +974,37 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1012,35 +1012,35 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" @@ -1076,11 +1076,11 @@ msgstr "Datu formatu ezezaguna" msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Barne errorea" @@ -1334,101 +1334,108 @@ msgstr "Paketeak egiaztapen gabe instalatu?" msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalatuta]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1436,27 +1443,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1465,7 +1472,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[B/e]" @@ -1473,21 +1480,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1545,10 +1552,6 @@ msgstr "Eginda" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1659,11 +1662,11 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" @@ -1982,31 +1985,38 @@ msgstr " %s: ez du bitar gainidazketa sarrerarik\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ezin da %s ireki" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gaizki osatutako override %s, lerroa: %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Huts egin du %s override fitxategia irakurtzean" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Huts egin du %s override fitxategia irakurtzean" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2034,20 +2044,20 @@ msgstr "Konprimatu Umeak" msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" @@ -2182,12 +2192,12 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -2301,14 +2311,14 @@ msgstr "" "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko " "balioa: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2708,7 +2718,7 @@ msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi" msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" @@ -3222,49 +3232,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Ezin izan da %s zeregina aurkitu" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3312,12 +3322,12 @@ msgstr "" msgid "Installing %s" msgstr "%s Instalatzen" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s kentzen" @@ -3338,111 +3348,111 @@ msgid "Running post-installation trigger %s" msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s : ezin da idatzi" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -114,7 +114,7 @@ msgstr "On annettava täsmälleen yksi lauseke" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,23 +349,23 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain" msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,96 +373,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -470,7 +470,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -478,14 +478,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,7 +494,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -502,30 +502,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -638,7 +638,7 @@ msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" @@ -731,16 +731,16 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -749,34 +749,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Kirjaudutaan sisään" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Vastapään nimeä ei saa selville" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Paikallista nimeä ei saa selville" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -784,121 +784,121 @@ msgstr "" "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::" "ftp::ProxyLogin on tyhjä." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Yhteys aikakatkaistiin" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lukuvirhe" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Vastaus aiheutti puskurin ylivuodon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Virhe kirjoitettaessa" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Pistoketta ei voitu luoda" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Ei onnistunut" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Passiivista pistoketta ei voitu kytkeä." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ei saanut kuuntelupistoketta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Pistoketta ei voitu nimetä" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Pistoketta ei voitu kuunnella" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Pistokkeen nimeä ei saatu selville" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Komennon PORT lähetys ei onnistu" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Tuntematon osoiteperhe %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Pistokkeen kytkeminen aikakatkaistiin" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Pistoke aikakatkaistiin" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\"" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Kysely" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" @@ -964,39 +964,39 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1004,35 +1004,35 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" @@ -1068,11 +1068,11 @@ msgstr "Tuntematon päiväysmuoto" msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Sisäinen virhe" @@ -1326,101 +1326,108 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?" msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Asennettu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1435,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1457,7 +1464,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[K/e]" @@ -1465,21 +1472,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1537,10 +1544,6 @@ msgstr "Valmis" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1651,11 +1654,11 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" @@ -1979,31 +1982,38 @@ msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2031,20 +2041,20 @@ msgstr "Compress-lapsiprosessi" msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" @@ -2179,12 +2189,12 @@ msgstr "Korvautuksen kaksoislisäys %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -2296,14 +2306,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2699,7 +2709,7 @@ msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut" msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" @@ -3214,49 +3224,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Kohteen %s tarkistussumma ei täsmää" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Tehtävää %s ei löytynyt" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3304,12 +3314,12 @@ msgstr "" msgid "Installing %s" msgstr "Asennetaan %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" @@ -3330,111 +3340,111 @@ msgid "Running post-installation trigger %s" msgstr "Suoritetaan jälkiasennusliipaisin %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2013-08-17 07:57+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgstr "Vous devez fournir au moins un motif de recherche" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " Table de version :" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -367,16 +367,16 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -386,7 +386,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -398,80 +398,80 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -481,17 +481,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -500,7 +500,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -509,14 +509,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -525,7 +525,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -534,31 +534,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -675,7 +675,7 @@ msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" @@ -795,16 +795,16 @@ msgstr "" msgid "Disk not found." msgstr "Disque non trouvé." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -813,34 +813,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Connexion en cours" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossible de déterminer le nom de la machine distante" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossible de déterminer le nom local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Le serveur a refusé notre connexion et a répondu : %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -848,123 +848,123 @@ msgstr "" "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" "ftp::ProxyLogin est vide." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Échec de TYPE, le serveur a répondu : %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Dépassement du délai de connexion" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erreur de lecture" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Une réponse a fait déborder le tampon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erreur d'écriture" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Impossible de créer un connecteur" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossible de se connecter sur le port de données, délai de connexion dépassé" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Échec" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Impossible de se connecter au port en mode passif." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Impossible de se connecter à un port" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Impossible d'écouter sur le port" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Impossible de déterminer le nom du port" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossible d'envoyer la commande PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famille d'adresses %u inconnue (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Délai de connexion au port de données dépassé" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Pas de réponse du port données dans les délais" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Requête" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -1032,25 +1032,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " "vérifier si gpgv est installé)." #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1059,15 +1059,15 @@ msgstr "" "Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». " "Peut-être le réseau nécessite-t-il une authentification." -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1075,35 +1075,35 @@ msgstr "" "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " "n'est pas disponible :\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" @@ -1139,11 +1139,11 @@ msgstr "Format de date inconnu" msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erreur interne" @@ -1409,101 +1409,108 @@ msgstr "Faut-il installer ces paquets sans vérification ?" msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installé]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1512,27 +1519,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1541,7 +1548,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[O/n]" @@ -1549,21 +1556,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1621,10 +1628,6 @@ msgstr "Fait" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1741,11 +1744,11 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" @@ -2070,31 +2073,38 @@ msgstr " %s ne possède pas également pas d'entrée « binary override »\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Échec de l'allocation de mémoire" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Entrée « override » %s mal formée ligne %llu n° 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Impossible de lire le fichier d'« override » %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Entrée « override » %s mal formée ligne %llu n° 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Entrée « override » %s mal formée %llu n° 2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Entrée « override » %s mal formée %llu n° 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Impossible de lire le fichier d'« override » %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2122,20 +2132,20 @@ msgstr "Fils compressé" msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" @@ -2273,12 +2283,12 @@ msgstr "Addition double d'une déviation %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" @@ -2391,7 +2401,7 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2400,7 +2410,7 @@ msgstr "" "Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets " "est déjà atteinte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2809,7 +2819,7 @@ msgstr "Erreur d'écriture du fichier d'état temporaire %s" msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" @@ -3375,36 +3385,36 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s" msgid "Hash mismatch for: %s" msgstr "Somme de contrôle de hachage incohérente pour %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet " "virtuel" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3413,20 +3423,20 @@ msgstr "" "Impossible de choisir une version installée ou candidate du paquet « %s » " "qui n'en n'a aucune" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un " "paquet virtuel" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3475,12 +3485,12 @@ msgstr "" msgid "Installing %s" msgstr "Installation de %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Suppression de %s" @@ -3501,87 +3511,87 @@ msgid "Running post-installation trigger %s" msgstr "Exécution des actions différées (« trigger ») de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Impossible d'ouvrir le fichier « %s »" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossible d'écrire sur %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3589,14 +3599,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3604,7 +3614,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3612,7 +3622,7 @@ msgid "" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -116,7 +116,7 @@ msgstr "Debe fornecer cando menos un patrón de busca" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,16 +355,16 @@ msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -373,7 +373,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -385,97 +385,97 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +484,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +493,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +509,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +518,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" @@ -754,16 +754,16 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -772,34 +772,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI incorrecto, os URI locais non deben comezar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Identificándose" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Non é posíbel determinar o nome do outro extremo" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Non é posíbel determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor rexeitou a conexión e dixo: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Fallou a orde USER, o servidor dixo: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Fallou a orde PASS, o servidor dixo: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -807,122 +807,122 @@ msgstr "" "Especificouse un servidor proxy pero non un script de conexión, Acquire::" "ftp::ProxyLogin está baleiro." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Fallou a orde TYPE, o servidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Esgotouse o tempo para a conexión" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Produciuse un erro de lectura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Unha resposta desbordou o búfer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Produciuse un erro de escritura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Non é posíbel crear un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Fallou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Non é posíbel conectar o socket pasivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo non puido obter un socket no que atender" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Non é posíbel ligar un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Non é posíbel escoitar no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Non é posíbel determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Non é posíbel enviar a orde PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familia de enderezos %u (AF_*) descoñecida" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "A conexión do socket de datos esgotou o tempo" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "O socket de datos esgotou o tempo" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Petición" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Non é posíbel chamar a " @@ -988,40 +988,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopouse polo menos unha sinatura incorrecta." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Produciuse un erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran correctas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1029,36 +1029,36 @@ msgstr "" "Non se puideron verificar as seguintes sinaturas porque a chave pública non " "está dispoñíbel:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" @@ -1095,11 +1095,11 @@ msgstr "Formato de datos descoñecido" msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Produciuse un erro interno" @@ -1358,101 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?" msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1460,27 +1467,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1489,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1497,21 +1504,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1569,10 +1576,6 @@ msgstr "Feito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1688,11 +1691,11 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" @@ -2014,31 +2017,38 @@ msgstr " %s tampouco ten unha entrada de «override» de binarios\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Non foi posíbel reservar memoria" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Non é posíbel puido abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "«Override» %s liña %lu incorrecta (1)" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Non foi posíbel ler o ficheiro de «override» %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "«Override» %s liña %lu incorrecta (1)" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "«Override» %s liña %lu incorrecta (2)" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "«Override» %s liña %lu incorrecta (3)" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Non foi posíbel ler o ficheiro de «override» %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2066,20 +2076,20 @@ msgstr "Fillo de compresión" msgid "Internal error, failed to create %s" msgstr "Produciuse un erro interno, non foi posíbel crear %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Non foi posíbel ler ao calcular o MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" @@ -2216,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces" msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" @@ -2333,7 +2343,7 @@ msgstr "" "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-" "Start. O valor actual é : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2342,7 +2352,7 @@ msgstr "" "Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi " "acadado." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2748,7 +2758,7 @@ msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s" msgid "Unable to parse package file %s (1)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" @@ -3284,34 +3294,34 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s" msgid "Hash mismatch for: %s" msgstr "Valor de hash non coincidente para: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a publicación «%s» de «%s»" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión «%s» de «%s»" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Non foi posíbel atopar a tarefa «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Non é posíbel seleccionar distintas versións do paquete «%s» xa que é " "puramente virtual" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3320,21 +3330,21 @@ msgstr "" "Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete " "«%s» xa que non ten ningunha delas" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é " "puramente virtual" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten " "candidata" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3384,12 +3394,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Retirando %s" @@ -3410,89 +3420,89 @@ msgid "Running post-installation trigger %s" msgstr "Executando o disparador de post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directorio «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparandose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para o retirado de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Retirouse %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para retirar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Retirouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Non é posíbel escribir en %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3500,7 +3510,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3508,7 +3518,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3516,7 +3526,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3525,7 +3535,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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" @@ -115,7 +115,7 @@ msgstr "Legalább egy keresési mintát meg kell adnia" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -351,17 +351,17 @@ msgstr "Belső hiba, a problémamegoldó hibát okozott" msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,80 +382,80 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött „%s” fájl kihagyása\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -492,14 +492,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -508,7 +508,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -517,30 +517,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -656,7 +656,7 @@ msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Nem található a(z) %s, a várakozás után sem" @@ -771,16 +771,16 @@ msgstr "" msgid "Disk not found." msgstr "A lemez nem található." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -789,34 +789,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Bejelentkezés" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nem lehet a partner nevét megállapítani" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nem lehet a helyi nevet megállapítani" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "A kiszolgáló visszautasította a kapcsolatot: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Hibás USER, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Hibás PASS, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -824,124 +824,124 @@ msgstr "" "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az " "Acquire::ftp::ProxyLogin üres." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Időtúllépés a kapcsolatban" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Olvasási hiba" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "A válasz túlcsordította a puffert." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Írási hiba" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nem lehet létrehozni a foglalatot" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Sikertelen" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nem lehet kapcsolódni a passzív foglalathoz." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "A getaddrinfo nem talált figyelőfoglalatot" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nem lehet összekapcsolódni a foglalattal" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nem lehet figyelni a foglalaton" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nem lehet megállapítani a foglalat nevét" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nem lehet PORT parancsot küldeni" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ismeretlen címcsalád: %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Az adatfoglalat túllépte az időkorlátot" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nem lehet meghívni " @@ -1007,37 +1007,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Legalább egy aláírás érvénytelen." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1045,35 +1045,35 @@ msgstr "" "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető " "el:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" @@ -1109,11 +1109,11 @@ msgstr "Ismeretlen dátumformátum" msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Belső hiba" @@ -1364,101 +1364,108 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Telepítve]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1466,27 +1473,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1495,7 +1502,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[I/n]" @@ -1503,21 +1510,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1575,10 +1582,6 @@ msgstr "Kész" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1693,11 +1696,11 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -2017,31 +2020,38 @@ msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #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 -msgid "Failed to read the override file %s" -msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2069,20 +2079,20 @@ msgstr "Gyermekfolyamat tömörítése" msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" @@ -2218,12 +2228,12 @@ msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "A(z) %s fájl írása sikertelen" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" @@ -2336,7 +2346,7 @@ msgstr "" "A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Start méretét. A " "jelenlegi érték: %lu. (lásd: man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2344,7 +2354,7 @@ msgid "" msgstr "" "Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2749,7 +2759,7 @@ msgstr "%s átmeneti állapotfájl írása sikertelen" msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" @@ -3289,32 +3299,32 @@ msgstr "%s hitelesítési rekordja nem található" msgid "Hash mismatch for: %s" msgstr "%s ellenőrzőösszege nem megfelelő" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "„%s” kiadás nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "„%s” verzió nem található ehhez: „%s”" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "„%s” feladat nem található" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3323,19 +3333,19 @@ msgstr "" "„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, " "mert egyikkel sem rendelkezik" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3383,12 +3393,12 @@ msgstr "" msgid "Installing %s" msgstr "%s telepítése" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" @@ -3409,87 +3419,87 @@ msgid "Running post-installation trigger %s" msgstr "A(z) %s telepítés utáni trigger futtatása" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "A(z) „%s” könyvtár hiányzik" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "A(z) „%s” fájl megnyitása sikertelen" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s telepítve" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nem lehet írni ebbe: %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3497,7 +3507,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3505,7 +3515,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3513,7 +3523,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3521,7 +3531,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren " "lévő hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2013-08-27 22:06+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -115,7 +115,7 @@ 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:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -362,17 +362,17 @@ msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -382,7 +382,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -394,80 +394,80 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -476,17 +476,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt." "conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +495,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +504,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo recente" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +520,7 @@ msgstr "" "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:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,30 +529,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -669,7 +669,7 @@ msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@ -784,16 +784,16 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -802,34 +802,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI non valido, gli URI locali non devono iniziare con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Accesso in corso" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossibile determinare il nome del nodo" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossibile determinare il nome locale" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Il server ha rifiutato la connessione e riporta: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER non riuscito, il server riporta: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS non riuscito, il server riporta: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -837,123 +837,123 @@ msgstr "" "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::" "ftp::ProxyLogin è vuoto." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Connessione scaduta" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Errore di lettura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Una risposta ha superato le dimensioni del buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Errore di scrittura" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Impossibile creare un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossibile connettersi al socket dati, tempo esaurito per la connessione" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Non riuscito" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Impossibile connettersi alla socket passiva." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Impossibile eseguire bind() su un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Impossibile eseguire listen() su un socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Impossibile determinare il nome del socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossibile inviare il comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT non riuscito, il server riporta: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Connessione al socket dati terminata" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Socket dati terminato" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Interrogazione" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -1020,25 +1020,25 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1047,15 +1047,15 @@ msgstr "" "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete " "richiede autenticazione?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1063,35 +1063,35 @@ msgstr "" "Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" @@ -1127,11 +1127,11 @@ msgstr "Formato della data sconosciuto" msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Errore interno" @@ -1392,101 +1392,108 @@ msgstr "Installare questi pacchetti senza verificarli?" msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installato]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1502,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1524,7 +1531,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1532,21 +1539,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1604,10 +1611,6 @@ msgstr "Eseguito" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1723,11 +1726,11 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -2053,31 +2056,38 @@ msgstr " %s non ha neppure un campo binario override\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Allocazione della memoria non riuscita" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s riga %llu malformato #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Lettura del file override %s non riuscita" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s riga %llu malformato #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s riga %llu malformato #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s riga %llu malformato #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lettura del file override %s non riuscita" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2105,20 +2115,20 @@ msgstr "Sottoprocesso compresso" msgid "Internal error, failed to create %s" msgstr "Errore interno, creazione di %s non riuscita" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file non riuscito" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" @@ -2252,12 +2262,12 @@ msgstr "Doppia aggiunta di deviazione %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplicato %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Scrittura del file %s non riuscita" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" @@ -2370,7 +2380,7 @@ msgstr "" "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il " "valore attuale è: %lu (man 5 apt.conf)." -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2380,7 +2390,7 @@ msgstr "" "byte è stato raggiunto." # (ndt) lunghetta... -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2791,7 +2801,7 @@ msgstr "Scrittura del file temporaneo di stato %s non riuscita" msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file di pacchetto %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file di pacchetto %s (2)" @@ -3345,35 +3355,35 @@ msgid "Hash mismatch for: %s" msgstr "Hash non corrispondente per %s" # (ndt) dovrebbe essere inteso il file Release -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release \"%s\" per \"%s\" non trovato." # (ndt) dovrebbe essere inteso il Version -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" per \"%s\" non trovato" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossibile trovare il task \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3382,21 +3392,21 @@ msgstr "" "Impossibile selezionare la versione installata o la candidata dal pacchetto " "\"%s\" poiché non sono presenti" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché " "è virtuale" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha " "alcun candidato" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3445,12 +3455,12 @@ msgstr "" msgid "Installing %s" msgstr "Installazione di %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" @@ -3471,89 +3481,89 @@ msgid "Running post-installation trigger %s" msgstr "Esecuzione comando di post installazione %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Directory \"%s\" mancante" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Impossibile aprire il file \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Pacchetto %s installato" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pacchetto %s rimosso" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossibile scrivere in %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3561,7 +3571,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3569,7 +3579,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3577,7 +3587,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3586,7 +3596,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2013-08-11 19:39+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -113,7 +113,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,17 +352,17 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました" msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,80 +384,80 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,17 +466,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." "conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -661,7 +661,7 @@ msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" @@ -774,16 +774,16 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -792,34 +792,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "不正な URI です。ローカルの URI は // で始まってはいけません" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "ログインしています" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "ピアネームを決定することができません" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ローカルネームを決定することができません" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "サーバから接続を拒絶されました。応答: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 失敗、サーバ応答: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 失敗、サーバ応答: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -827,121 +827,121 @@ msgstr "" "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。" "Acquire::ftp::ProxyLogin が空です。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 失敗、サーバ応答: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "接続タイムアウト" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "読み込みエラー" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "レスポンスがバッファをオーバフローさせました。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "書き込みエラー" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "ソケットを作成できません" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "パッシブソケットに接続できません。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo はリスニングソケットを取得できませんでした" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "ソケットをバインドできませんでした" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "ソケットをリスンできませんでした" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "ソケットの名前を特定できませんでした" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT コマンドを送信できません" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知のアドレスファミリ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT に失敗しました。サーバ応答: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "データソケット接続タイムアウト" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ファイルを取得できません。サーバ応答 '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "データソケットタイムアウト" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "データ転送に失敗しました。サーバ応答 '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "問い合わせ" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "呼び出せません" @@ -1007,23 +1007,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1032,49 +1032,49 @@ msgstr "" "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク" "が必要?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" @@ -1110,11 +1110,11 @@ msgstr "不明な日付フォーマットです" msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "接続失敗" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "内部エラー" @@ -1361,101 +1361,108 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [インストール済み]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " または" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1463,27 +1470,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1492,7 +1499,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1500,21 +1507,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1574,10 +1581,6 @@ msgstr "完了" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1691,11 +1694,11 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -2012,31 +2015,38 @@ msgstr " %s にバイナリ override エントリがありません\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "'%s' をオープンできません" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "不正な override %s %llu 行目 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "override ファイル %s を読み込むのに失敗しました" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "不正な override %s %llu 行目 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "不正な override %s %llu 行目 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "不正な override %s %llu 行目 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "override ファイル %s を読み込むのに失敗しました" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2064,20 +2074,20 @@ msgstr "圧縮子プロセス" msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" @@ -2211,12 +2221,12 @@ msgstr "%s -> %s の diversion が二重に追加されています" msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" @@ -2329,14 +2339,14 @@ msgstr "" "動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現" "在値は %lu です (man 5 apt.conf を参照)。" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2747,7 @@ msgstr "一時状態ファイル %s の書き込みに失敗しました" msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" @@ -3278,32 +3288,32 @@ msgstr "認証レコードが見つかりません: %s" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "タスク '%s' が見つかりません" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3312,18 +3322,18 @@ msgstr "" "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" "ので選べません" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3372,12 +3382,12 @@ msgstr "" msgid "Installing %s" msgstr "%s をインストールしています" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s を削除しています" @@ -3398,87 +3408,87 @@ msgid "Running post-installation trigger %s" msgstr "インストール後トリガ %s を実行しています" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "ファイル '%s' をオープンできませんでした" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s に書き込めません" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3486,7 +3496,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3494,7 +3504,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3502,7 +3512,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3511,7 +3521,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -118,7 +118,7 @@ msgstr "អ្នកត្រូវតែផ្ដល់លំនា msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "មិនអាចកំណត់ទីតាំងកញ្ចប់ %s បានឡើយ" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " តារាងកំណែ ៖" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -354,23 +354,23 @@ msgstr "កំហុសខាងក្នុង អ្នកដោះស msgid "Unable to lock the download directory" msgstr "មិនអាចចាក់សោថតទាញយកបានឡើយ" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់ត្រូវបញ្ជាក់កញ្ចប់មួយ ដើម្បីទៅប្រមូលយកប្រភពសម្រាប់" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "មិនអាចរកកញ្ចប់ប្រភពសម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -378,114 +378,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុងរំលងឯកសារដែលបានទាញយករួច '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិនអាចកំណត់ទំហំទំនេរក្នុង %s បានឡើយ" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នកពុំមានទំហំទំនេរគ្រប់គ្រាន់ទេនៅក្នុង %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការយក %sB/%sB នៃប័ណ្ណសារប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការយក %sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូលប្រភព %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "បរាជ័យក្នុងការទៅប្រមូលយកប័ណ្ណសារមួយចំនួន ។" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញយក ហើយតែក្នុងរបៀបទាញយកប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុងរំលងការស្រាយនៃប្រភពដែលបានស្រាយរួចនៅក្នុង %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យបញ្ជាស្រាយ '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យប្រសិនបើកញ្ចប់ 'dpkg-dev' មិនទាន់បានដំឡើង ។\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសងពាក្យបញ្ជា '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "ដំណើរការកូនបានបរាជ័យ" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែបញ្ជាក់យ៉ាងហោចណាស់មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិនអាចសាងសង់ព័ត៌មានភាពអស្រ័យសម្រាប់ %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យស្ថាបនាឡើយ ។\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យសម្រាប់ %s មិនអាចធ្វើឲ្យពេញចិត្ត ព្រោះរក %s កញ្ចប់មិនឃើញ " -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យសម្រាប់ %s មិនអាចធ្វើឲ្យពេញចិត្ត ព្រោះរក %s កញ្ចប់មិនឃើញ " -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,37 +494,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាចតម្រូវចិត្តបានទេ ព្រោះ មិនមានកំណែនៃកញ្ចប់ %s ដែលអាចតម្រូវចិត្ត" "តម្រូវការកំណែបានឡើយ" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, 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:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យដែលបង្កើត %s មិនអាចបំពេញសេចក្ដីត្រូវការបានទេ ។" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "បានបរាជ័យក្នុងការដំណើរការបង្កើតភាពអាស្រ័យ" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុងតភ្ជាប់ទៅកាន់ %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "ម៉ូឌុលដែលគាំទ្រ ៖ " -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -636,7 +636,7 @@ msgstr "%s ជាកំណែដែលថ្មីបំផុតរួចទ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់ %s ប៉ុន្តែ វាមិននៅទីនោះ" @@ -729,16 +729,16 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី-រ៉ូ msgid "Disk not found." msgstr "រកថាសមិនឃើញ ។" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "រកឯកសារមិនឃើញ" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "បរាជ័យក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់ពេលវេលាការកែប្រែ" @@ -747,155 +747,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI មិនត្រឹមត្រូវ URIS មូលដ្ឋានមិនត្រូវចាប់ផ្តើមជាមួយ // ឡើយ" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "កំពុងចូល" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "មិនអាចកំណត់ឈ្មោះដែលត្រូវបង្ហាញបានឡើយ" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "មិនអាចកំណត់ឈ្មោះមូលដ្ឋានបានឡើយ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "ម៉ាស៊ីនបម្រើបានបដិសេធការតភ្ជាប់ ហើយ បាននិយាយ ៖ %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER បរាជ័យ ម៉ាស៊ីនបម្រើបាននិយាយ ៖ %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS បានបរាជ័យ ម៉ាស៊ីនបម្រើបាននិយាយ ៖ %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "ម៉ាស៊ីនបម្រើប្រូកស៊ីត្រូវបានបញ្ជាក់ ប៉ុន្តែគ្មានស្គ្រីបចូលទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "ពាក្យបញ្ជាស្គ្រីបចូល '%s' បានបរាជ័យ ម៉ាស៊ីនបម្រើបាននិយាយ ៖ %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE បានបរាជ័យ ម៉ាស៊ីនបម្រើបាននិយាយ ៖ %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "អស់ពេលក្នុងការតភ្ជាប់" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "ម៉ាស៊ីនបម្រើបានបិទការតភ្ជាប់" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "ការអានមានកំហុស" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "ឆ្លើយតបសតិបណ្តោះអាសន្នអស់ចំណុះ ។" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "ការបង្ខូចពិធីការ" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "ការសរសេរមានកំហុស" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "មិនអាចបង្កើតរន្ធបានឡើយ" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "មិនអាចតភ្ជាប់រន្ធទិន្នន័យបានឡើយ អស់ពេលក្នុងការតភ្ជាប់" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "បានបរាជ័យ" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "មិនអាចតភ្ជាប់រន្ធអកម្មបានឡើយ ។" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo មិនអាចទទួលយករន្ធសម្រាប់ស្តាប់បានឡើយ" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "មិនអាចចងរន្ធបានបានឡើយ" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "មិនអាចស្ដាប់នៅលើរន្ធបានឡើយ" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "មិនអាចកំណត់ឈ្មោះរបស់រន្ធបានឡើយ" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "មិនអាចផ្ញើពាក្យបញ្ជា PORT បានឡើយ" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "មិនស្គាល់អាសយដ្ឋានគ្រួសារ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT បរាជ័យ ម៉ាស៊ីនបម្រើបាននិយាយ ៖ %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "ការតភ្ជាប់រន្ធទិន្នន័បានអស់ពេល" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "មិនអាចទទួលយកការតភ្ជាប់បានឡើយ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "បញ្ហាធ្វើឲ្យខូចឯកសារ" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "មិនអាចទៅប្រមូលយកឯកសារបានឡើយ ម៉ាស៊ីនបម្រើបាននិយាយ '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "រន្ធទិន្នន័យបានអស់ពេល" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "បរាជ័យក្នុងការផ្ទេរទិន្នន័យ ម៉ាស៊ីនបម្រើបាននិយាយ '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "សំណួរ" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "មិនអាចហៅ " @@ -961,71 +961,71 @@ msgstr "ការដោះស្រាយអ្វីអាក្រក msgid "Unable to connect to %s:%s:" msgstr "មិនអាចតភ្ជាប់ទៅកាន់ %s %s ៖" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុសខាងក្នុង ៖ ហត្ថលេខាល្អ ប៉ុន្តែ មិនអាចកំណត់កូនសោស្នាមម្រាមដៃ ?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "បានជួបប្រទះហត្ថលេខាយ៉ាងហោចណាស់មួយ ដែលត្រឹមត្រូវ ។" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិនអាចប្រតិបត្តិ '%s' ដើម្បីផ្ទៀងផ្ទាត់ហត្ថលេខា (តើ gpgv ត្រូវបានដំឡើងឬនៅ ?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខាខាងក្រោមមិនត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ហត្ថលេខាខាងក្រោមមិនអាចផ្ទៀងផ្ទាត់បានទេ ព្រោះកូនសោសាធារណៈមិនអាចប្រើបាន ៖\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារ" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុសក្នុងការអានពីម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់ពីចម្ងាយបានបិទការតភ្ជាប់" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "កំហុសក្នុងការអានពីម៉ាស៊ីនបម្រើ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារ" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "ជ្រើសបានបរាជ័យ" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "ការតភ្ជាប់បានអស់ពេល" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារលទ្ធផល" @@ -1061,11 +1061,11 @@ msgstr "មិនស្គាល់ទ្រង់ទ្រាយកាល msgid "Bad header data" msgstr "ទិន្នន័យបឋមកថាខូច" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "ការតភ្ជាប់បានបរាជ័យ" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "កំហុសខាងក្នុង" @@ -1308,101 +1308,108 @@ msgstr "ដំឡើងកញ្ចប់ទាំងនេះ ដោ msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [បានដំឡើង]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់ខាងក្រោមមានភាពអាស្រ័យដែលខុសគ្នា ៖" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ %s ត្រូវបានដំឡើង" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ %s នឹងត្រូវបានដំឡើង" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ប៉ុន្តែវាមិនអាចដំឡើងបានទេ" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ប៉ុន្តែវាជាកញ្ចប់និម្មិត" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ប៉ុន្តែវាមិនបានដំឡើងទេ" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វានឹងមិនត្រូវបានដំឡើងទេ" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់ថ្មីខាងក្រោមនឹងត្រូវបានដំឡើង ៖" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានយកចេញ ៖" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "កញ្ចប់ខាងក្រោមត្រូវបានយកត្រឡប់មកវិញ ៖" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានធ្វើឲ្យប្រសើឡើង ៖" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានបន្ទាប ៖" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "កញ្ចប់រង់ចាំខាងក្រោមនឹងត្រូវបានផ្លាស់ប្តូរ ៖" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយសារតែ %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1410,27 +1417,27 @@ msgstr "" "ព្រមាន ៖ កញ្ចប់ដែលចាំបាច់ខាងក្រោមនឹងត្រូវបានយកចេញ ។\n" "ការយកចេញនេះមិនត្រូវបានធ្វើទេលុះត្រាតែអ្នកដឹងថាអ្នកកំពុងធ្វើអ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវបានធ្វើឲ្យប្រសើរ %lu ត្រូវបានដំឡើងថ្មី " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវបានដំឡើងឡើងវិញ " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវយកចេញ ហើយ %lu មិនបានធ្វើឲ្យប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិនបានដំឡើង ឬ យកចេញបានគ្រប់ជ្រុងជ្រោយឡើយ ។\n" @@ -1439,7 +1446,7 @@ msgstr "%lu មិនបានដំឡើង ឬ យកចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1447,21 +1454,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុសការចងក្រង - %s" @@ -1519,10 +1526,6 @@ msgstr "ធ្វើរួច" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1633,11 +1636,11 @@ msgstr "មិនអាចបើកឯកសារ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យក្នុងការបង្កើតបំពង់ IPC សម្រាប់ដំណើរការរង" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "បានបិទការតភ្ជាប់មុនពេល" @@ -1956,31 +1959,38 @@ msgstr " %s គ្មានធាតុបដិសេធគោលព msgid "realloc - Failed to allocate memory" msgstr "realloc - បរាជ័យក្នុងការបម្រុងទុកសតិ" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "មិនអាចបើក %s បានឡើយ" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "បានបរាជ័យក្នុងការអានឯកសារបដិសេធ %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "បានបរាជ័យក្នុងការអានឯកសារបដិសេធ %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2008,20 +2018,20 @@ msgstr "បង្ហាប់កូន" msgid "Internal error, failed to create %s" msgstr "កំហុសខាងក្នុង បរាជ័យក្នុងការបង្កើត %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់ដំណើរការរង/ឯកសារ បានបរាជ័យ" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "បានបរាជ័យក្នុងការអាន នៅពេលគណនា MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហាក្នុងការផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យក្នុងការប្តូរឈ្មោះ %s ទៅ %s" @@ -2156,12 +2166,12 @@ msgstr "ការបន្ថែមស្ទួន នៃការបង្ msgid "Duplicate conf file %s/%s" msgstr "ឯកសារកំណត់រចនាសម្ព័ន្ធស្ទួន %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យក្នុងការសរសេរឯកសារ %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យក្នុងការបិទឯកសារ %s" @@ -2274,14 +2284,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2678,7 +2688,7 @@ msgstr "បរាជ័យក្នុងការសរសេរឯក msgid "Unable to parse package file %s (1)" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (2) បានឡើយ" @@ -3188,49 +3198,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum មិនផ្គួផ្គង" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រកមិនឃើញការចេញផ្សាយ '%s' សម្រាប់ '%s' ឡើយ" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រកមិនឃើញកំណែ '%s' សម្រាប់ '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "មិនអាចរកកញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "មិនអាចរកកញ្ចប់ %s បានទេ" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3277,12 +3287,12 @@ msgstr "" msgid "Installing %s" msgstr "បានដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "កំពុងកំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "កំពុងយក %s ចេញ" @@ -3303,111 +3313,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជីថត %spartial គឺបាត់បង់ ។" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "មិនអាចបើកឯកសារ %s បានឡើយ" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "កំពុងស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំកំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "បានដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បីការយកចេញនៃ %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "បានយក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុងរៀបចំយក %s ចេញទាំងស្រុង" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "បានយក %s ចេញទាំងស្រុង" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "មិនអាចសរសេរទៅ %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -109,7 +109,7 @@ msgstr "최소 한 개의 검색어를 지정해야 합니다" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" @@ -153,7 +153,7 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -345,16 +345,16 @@ msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -363,7 +363,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -374,95 +374,95 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -471,7 +471,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -480,14 +480,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,7 +496,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -505,30 +505,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -643,7 +643,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" @@ -736,16 +736,16 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -754,34 +754,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다." #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "로그인하는 중입니다" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "상대방의 이름을 알 수 없습니다" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "로컬 이름을 알 수 없습니다" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 실패, 서버에서는: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 실패, 서버에서는: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -789,121 +789,121 @@ msgstr "" "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::" "ProxyLogin 값이 비어 있습니다." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 실패, 서버에서는: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "연결 시간 초과" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "읽기 오류" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "응답이 버퍼 크기를 넘어갔습니다." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "쓰기 오류" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "소켓을 만들 수 없습니다" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "실패" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "수동(passive) 소켓을 연결할 수 없습니다." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "소켓을 bind할 수 없습니다" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "소켓에 listen할 수 없습니다" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "소켓의 이름을 알아낼 수 없습니다" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT 명령을 보낼 수 없습니다" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 실패, 서버에서는: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "데이터 소켓 연결 시간 초과" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "데이터 소켓에 제한 시간이 초과했습니다" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "데이터 전송 실패, 서버에서는: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "질의" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " @@ -969,71 +969,71 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생 msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" @@ -1069,11 +1069,11 @@ msgstr "데이터 형식을 알 수 없습니다" msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "내부 오류" @@ -1319,101 +1319,108 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?" msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [설치함]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1421,27 +1428,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1450,7 +1457,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Y/n]" @@ -1458,21 +1465,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1531,10 +1538,6 @@ msgstr "완료" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1648,11 +1651,11 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -1971,31 +1974,38 @@ msgstr " %s에는 binary override 항목이 없습니다\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는데 실패했습니다" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s 열 수 없습니다" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "%s override 파일을 읽는데 실패했습니다" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s override 파일을 읽는데 실패했습니다" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2023,20 +2033,20 @@ msgstr "압축 하위 프로세스" msgid "Internal error, failed to create %s" msgstr "내부 오류, %s 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" @@ -2172,12 +2182,12 @@ msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는데 실패했습니다" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" @@ -2289,14 +2299,14 @@ msgstr "" "동적 mmap이 한계를 벗어났습니다. APT::Cache-Start의 크기를 높이십시오. 현재 " "값: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2693,7 +2703,7 @@ msgstr "임시 상태파일 %s 쓰는데 실패했습니다" msgid "Unable to parse package file %s (1)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" @@ -3210,32 +3220,32 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" msgid "Hash mismatch for: %s" msgstr "다음의 해시가 다릅니다: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' 작업을 찾을 수 없습니다" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3244,17 +3254,17 @@ msgstr "" "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" "다." -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." @@ -3302,12 +3312,12 @@ msgstr "" msgid "Installing %s" msgstr "%s 설치하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s 설정 중입니다" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s 패키지를 지우는 중입니다" @@ -3328,87 +3338,87 @@ msgid "Running post-installation trigger %s" msgstr "설치 후 트리거 %s 실행하는 중입니다" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "디렉터리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s 준비 중입니다" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s 패키지를 설정할 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s 설치" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s 패키지를 지울 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s 패키지를 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s에 쓸 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3416,20 +3426,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3437,7 +3447,7 @@ msgid "" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -117,7 +117,7 @@ msgstr "Pêwist e tu mînakekê bidî" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -317,23 +317,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -341,151 +341,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -558,7 +558,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -649,17 +649,17 @@ msgstr "" msgid "Disk not found." msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -668,154 +668,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Têketin" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nikare navê herêmî tesbît bike" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Çewiya xwendinê" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Çewtiya nivîsînê" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Serneket" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, fuzzy, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Danegira %s nehate vekirin: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Lêpirsîn" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 #, fuzzy msgid "Unable to invoke " msgstr "%s venebû" @@ -882,71 +882,71 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "" -#: methods/http.cc:659 +#: methods/http.cc:656 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" @@ -983,11 +983,11 @@ msgstr "" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1217,127 +1217,134 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sazkirî]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " û" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1346,7 +1353,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1355,21 +1362,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1426,10 +1433,6 @@ msgstr "Temam" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1537,11 +1540,11 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" @@ -1806,29 +1809,36 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s venebû" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:163 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#: ftparchive/override.cc:175 #, c-format -msgid "Failed to read the override file %s" +msgid "Malformed override %s line %llu #2" +msgstr "" + +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" msgstr "" #: ftparchive/multicompress.cc:70 @@ -1858,20 +1868,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -2000,12 +2010,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" @@ -2119,14 +2129,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2521,7 +2531,7 @@ msgstr "%s ji hev nehate veçirandin" msgid "Unable to parse package file %s (1)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, fuzzy, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" @@ -3018,49 +3028,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Peywira %s nehate dîtin" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3105,12 +3115,12 @@ msgstr "" msgid "Installing %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" @@ -3131,111 +3141,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nikarî pelê %s veke" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -115,7 +115,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -314,23 +314,23 @@ msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -338,95 +338,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -434,7 +434,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -442,14 +442,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -458,7 +458,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -466,30 +466,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -562,7 +562,7 @@ msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -653,16 +653,16 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas. msgid "Disk not found." msgstr "Diskas nerastas." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -671,154 +671,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Jungiamasi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Jungiamasi per ilgai" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Skaitymo klaida" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Rašymo klaida" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nepavyko" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Užklausti" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "" @@ -884,70 +884,70 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "" @@ -983,11 +983,11 @@ msgstr "" msgid "Bad header data" msgstr "" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vidinė klaida" @@ -1229,101 +1229,108 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?" msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Įdiegtas]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1331,27 +1338,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1360,7 +1367,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[T/n]" @@ -1368,21 +1375,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1441,10 +1448,6 @@ msgstr "Įvykdyta" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1555,11 +1558,11 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "" @@ -1888,31 +1891,38 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nepavyko išskirti atminties" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nepavyko atverti %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nepavyko nuskaityti perrašymo failo %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepavyko nuskaityti perrašymo failo %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -1940,20 +1950,20 @@ msgstr "" msgid "Internal error, failed to create %s" msgstr "Vidinė klaida, nepavyko sukurti %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Skaitymo klaida skaičiuojant MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" @@ -2090,12 +2100,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2208,14 +2218,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2610,7 +2620,7 @@ msgstr "" msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -3110,49 +3120,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nepavyko rasti užduoties %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nepavyko rasti paketo %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3200,12 +3210,12 @@ msgstr "" msgid "Installing %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigūruojamas %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Šalinamas %s" @@ -3226,111 +3236,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Trūksta aplanko „%s“" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Ruošiamas %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Išpakuojamas %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Ruošiamasi konfigūruoti %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Ruošiamasi %s pašalinimui" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Ruošiamasi visiškai pašalinti %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nepavyko įrašyti į %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -112,7 +112,7 @@ msgstr "तुम्हाला फक्त एकच नमुना द् msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -348,23 +348,23 @@ msgstr "अंतर्गत त्रुटी, अडचण निवार msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -372,114 +372,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -488,37 +488,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, 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:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -632,7 +632,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" @@ -725,16 +725,16 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण msgid "Disk not found." msgstr "डिस्क सापडत नाही" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -743,34 +743,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "लॉग इन करत आहे" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "स्थानिक नाव सांगण्यास असमर्थ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -778,121 +778,121 @@ msgstr "" "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन " "निरर्थक आहे." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "वेळेअभावी संबंध जोडता येत नाही" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "त्रुटी वाचा" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "प्रतिसाधाने बफर भरुन गेले." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "लिहिण्यात त्रुटी" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "सॉकेट तयार करू शकत नाही" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असमर्थ" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "पॅसिव्ह सॉकेट जोडता येत नाही" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "सॉकेट चिकटवता येत नाही" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "सॉकेट वर ऐकता येत नाही" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "सॉकेटचे नाव सांगता येत नाही" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "डेटा सॉकेट वेळेअभावी तुटले" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "प्रश्न" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" @@ -958,72 +958,72 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" @@ -1059,11 +1059,11 @@ msgstr "अपरिचित दिनांक प्रकार/स्वर msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -1312,101 +1312,108 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[संस्थापित केले]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1414,27 +1421,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1443,7 +1450,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1451,21 +1458,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1523,10 +1530,6 @@ msgstr "झाले" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1637,11 +1640,11 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" @@ -1961,31 +1964,38 @@ msgstr "%s ला द्वयंक ओव्हरराईड जागा msgid "realloc - Failed to allocate memory" msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s उघडण्यास असमर्थ" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2013,20 +2023,20 @@ msgstr "चॉईल्ड(प्रोसेस)ला संकलित क msgid "Internal error, failed to create %s" msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO ची उपक्रिया/संचिका असमर्थ " -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " @@ -2162,12 +2172,12 @@ msgstr "%s -> %s डायव्हर्जन दुप्पट मिळव msgid "Duplicate conf file %s/%s" msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" @@ -2279,14 +2289,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2682,7 +2692,7 @@ msgstr "%s तात्पुरत्या StateFile मध्ये लिह msgid "Unable to parse package file %s (1)" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" @@ -3199,49 +3209,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "%s कार्य सापडू शकले नाही" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3289,12 +3299,12 @@ msgstr "" msgid "Installing %s" msgstr "%s संस्थापित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" @@ -3315,111 +3325,111 @@ msgid "Running post-installation trigger %s" msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' संचयिका गहाळ आहे" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -116,7 +116,7 @@ msgstr "Du må oppgi minst ett søkemønster" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,16 +354,16 @@ msgstr "Intern feil, problemløser ødela noe" msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -383,116 +383,116 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken " "%s er for ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,37 +501,37 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -647,7 +647,7 @@ msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" @@ -742,16 +742,16 @@ msgstr "" msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -760,34 +760,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logger inn" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Klarte ikke å fastslå navnet på motparten" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Klarte ikke å fastslå det lokale navnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tjeneren nektet oss å kople til og sa: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -795,121 +795,121 @@ msgstr "" "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::" "ftp::ProxyLogin» er tomt." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsavbrudd på forbindelsen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Et svar oversvømte bufferen." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Klarte ikke å opprette en sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislyktes" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Klarte ikke å koble til en passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Klarte ikke å binde til sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Klarte ikke å lytte til sokkel" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Klarte ikke å avgjøre sokkelnavnet" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Klarte ikke å sende PORT-kommandoen" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjent adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikke å hente fila, tjeneren sa «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsavbrudd på datasokkelen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Spørring" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Klarte ikke å starte" @@ -975,37 +975,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1013,35 +1013,35 @@ msgstr "" "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen " "ikke er tilgjengelig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" @@ -1077,11 +1077,11 @@ msgstr "Ukjent datoformat" msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern feil" @@ -1333,101 +1333,108 @@ msgstr "Installer disse pakkene uten verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1442,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1464,7 +1471,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1472,21 +1479,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1544,10 +1551,6 @@ msgstr "Utført" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1662,11 +1665,11 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -1987,31 +1990,38 @@ msgstr " %s har ingen binæroverstyringsoppføring heller\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke å tildele minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig overstyring %s linje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Klarte ikke å lese overstyringsfila %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Ugyldig overstyring %s linje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikke å lese overstyringsfila %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2039,20 +2049,20 @@ msgstr "Komprimer barneprosess" msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" @@ -2188,12 +2198,12 @@ msgstr "Dobbel tillegging av avledning %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" @@ -2305,7 +2315,7 @@ msgstr "" "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Start. " "Nåværende verdi: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2314,7 +2324,7 @@ msgstr "" "Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er " "nådd." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2712,7 +2722,7 @@ msgstr "Klarte ikke å skrive midlertidig StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" @@ -3231,32 +3241,32 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke for: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Klarte ikke å finne oppgave «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Klarte ikke finne noen pakken med regex «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3265,20 +3275,20 @@ msgstr "" "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " "har ingen av dem" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen " "kandidat" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3328,12 +3338,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Setter opp %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3354,87 +3364,87 @@ msgid "Running post-installation trigger %s" msgstr "Kjører etter-installasjonsutløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mappa «%s» mangler" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan ikke skrive til %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3442,7 +3452,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3450,7 +3460,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3458,7 +3468,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3467,7 +3477,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -115,7 +115,7 @@ msgstr "तपाईँले एउटा वास्तविक बान् msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -352,23 +352,23 @@ msgstr "आन्तरिक त्रुटि,समस्या हलकर msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -376,114 +376,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -492,37 +492,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, 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:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -634,7 +634,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" @@ -727,16 +727,16 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -745,34 +745,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "लगइन भइरहेछ" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "समान नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "पास असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -780,121 +780,121 @@ msgstr "" "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin " "खाली छ ।" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "टाइप असफल भयो: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "जडान समय सकियो" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "एउटा सकेट सिर्जना गर्न सकेन" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "असफल भयो" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "निस्क्रिय सकेट जडान गर्न सकिएन" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "सकेट बाँध्न सकिएन" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "सकेटमा सुन्न सकिएन" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "सकेट नाम निर्धारण गर्न सकिएन" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "पोर्ट आदेश पठाउन असक्षम भयो" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "अज्ञात ठेगाना परिवार %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "डेटा सकेटको जडान समय सकियो" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "डेटा सकेट समय सकियो" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "क्वेरी" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" @@ -960,71 +960,71 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" @@ -1060,11 +1060,11 @@ msgstr "अज्ञात मिति ढाँचा" msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -1309,101 +1309,108 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [स्थापना भयो]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1411,27 +1418,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1440,7 +1447,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1448,21 +1455,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1520,10 +1527,6 @@ msgstr "काम भयो" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1634,11 +1637,11 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" @@ -1958,31 +1961,38 @@ msgstr " %s संग कुनै अधिलेखन प्रविष् msgid "realloc - Failed to allocate memory" msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "अधिलेखन फाइल पढ्न असफल %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "अधिलेखन फाइल पढ्न असफल %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2010,20 +2020,20 @@ msgstr "सङ्कुचन शाखा" msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" @@ -2158,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" @@ -2276,14 +2286,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2680,7 +2690,7 @@ msgstr "फाइल %s लेख्न असफल भयो" msgid "Unable to parse package file %s (1)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" @@ -3190,49 +3200,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "MD5Sum मेल भएन" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3280,12 +3290,12 @@ msgstr "" msgid "Installing %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" @@ -3306,111 +3316,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -115,7 +115,7 @@ msgstr "U dient precies één zoekpatroon op te geven" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,18 +354,18 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +375,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -387,97 +387,97 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -659,7 +659,7 @@ msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" @@ -753,16 +753,16 @@ msgstr "" msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -771,34 +771,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Bezig met aanmelden" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kan de 'peer'-naam niet bepalen" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kan de lokale naam niet bepalen" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Onze verbinding is door de server geweigerd met bericht: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukt; bericht van server: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukt; bericht van server: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -806,121 +806,121 @@ msgstr "" "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::" "ProxyLogin is leeg." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van server: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Verbinding is verlopen" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Leesfout" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Een reactie deed de buffer overlopen" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Schrijffout" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kon geen socket aanmaken" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukt" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kon de passieve socket niet verbinden." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kon geen luistersocket verkrijgen" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kon geen socket binden" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kon niet op de socket niet luisteren" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kon de socketnaam niet bepalen" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kan PORT-commando niet verzenden" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Onbekende adresfamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT is mislukt; bericht van server: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Datasocket verbinding is verlopen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kan bestand niet ophalen; bericht van server: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datasocket verliep" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer is mislukt, server zei: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -986,40 +986,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1027,36 +1027,36 @@ msgstr "" "De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" @@ -1094,11 +1094,11 @@ msgstr "Onbekend datumformaat" msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Interne fout" @@ -1353,101 +1353,108 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?" msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Geïnstalleerd]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " of" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1455,27 +1462,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1484,7 +1491,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1492,21 +1499,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1564,10 +1571,6 @@ msgstr "Klaar" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1682,11 +1685,11 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" @@ -2013,31 +2016,38 @@ msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Misvormde voorrangsingang %s op regel %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Lezen van het voorrangsbestand %s is mislukt" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misvormde voorrangsingang %s op regel %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lezen van het voorrangsbestand %s is mislukt" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2065,20 +2075,20 @@ msgstr "Comprimeer kind" msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" @@ -2214,12 +2224,12 @@ msgstr "Dubbele toevoeging van de omleiding %s->%s" msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -2331,7 +2341,7 @@ msgstr "" "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-" "Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2340,7 +2350,7 @@ msgstr "" "Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al " "is bereikt" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2746,7 +2756,7 @@ msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt" msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" @@ -3283,33 +3293,33 @@ msgstr "Kan geen authenticatierecord vinden voor: %s" msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen voor: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kon taak '%s' niet vinden" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kon geen enkel pakket vinden bij regex '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, fuzzy, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3318,21 +3328,21 @@ msgstr "" "Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' " "selecteren omdat deze geen van beide heeft" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver " "virtueel is" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen " "kandidaat heeft" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3382,12 +3392,12 @@ msgstr "" msgid "Installing %s" msgstr "%s wordt geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" @@ -3408,89 +3418,89 @@ msgid "Running post-installation trigger %s" msgstr "Post-installatie-trigger %s wordt uitgevoerd" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Map '%s' ontbreekt" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kan niet naar %s schrijven" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3498,7 +3508,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3506,7 +3516,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3514,7 +3524,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3523,7 +3533,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -117,7 +117,7 @@ msgstr "Du m oppgi nyaktig eitt mnster" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -357,23 +357,23 @@ msgstr "Intern feil. AllUpgrade ydelagde noko" msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -381,115 +381,115 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,37 +498,37 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -641,7 +641,7 @@ msgstr "Den nyaste versjonen av %s er installert fr fr.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" @@ -736,16 +736,16 @@ msgstr "" msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -754,34 +754,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Loggar inn" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Klarte ikkje avgjera namnet p motparten" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Klarte ikkje avgjera det lokale namnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Tenaren nekta oss kopla til, og sa: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukkast, tenaren sa: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukkast, tenaren sa: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -789,121 +789,121 @@ msgstr "" "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet " "Acquire::ftp::ProxyLogin er tomt." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandoen %s i innlogginsskriptet mislukkast, tenaren sa: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukkast, tenaren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsavbrot p samband" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lesefeil" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Eit svar flaumde over bufferen." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Klarte ikkje oppretta sokkel" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Mislukkast" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Klarte ikkje kopla til passiv sokkel." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Klarte ikkje binda til sokkel" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Klarte ikkje lytta til sokkel" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Klarte ikkje avgjera sokkelnamnet" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Klarte ikkje senda PORT-kommandoen" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjend adressefamilie %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislukkast, tenaren sa: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Tidsavbrot p tilkopling til datasokkel" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikkje henta fila, tenaren sa %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Tidsavbrot p datasokkelen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverfringa mislukkast, tenaren sa %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Sprjing" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Klarte ikkje starta " @@ -969,71 +969,71 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" @@ -1069,11 +1069,11 @@ msgstr "Ukjend datoformat" msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Intern feil" @@ -1318,101 +1318,108 @@ msgstr "Installer desse pakkane utan verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1421,27 +1428,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1450,7 +1457,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1458,21 +1465,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1531,10 +1538,6 @@ msgstr "Ferdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1645,11 +1648,11 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" @@ -1964,31 +1967,38 @@ msgstr " %s har inga overstyringsoppfring\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Misforma overstyring %s linje %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Klarte ikkje lesa overstyringsfila %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Misforma overstyring %s linje %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikkje lesa overstyringsfila %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2016,20 +2026,20 @@ msgstr "Komprimer barn" msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" @@ -2164,12 +2174,12 @@ msgstr "Dobbel tilleggjing av avleiing %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -2282,14 +2292,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2686,7 +2696,7 @@ msgstr "Klarte ikkje skriva fila %s" msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" @@ -3203,49 +3213,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Feil MD5-sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Fann ikkje pakken %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3293,12 +3303,12 @@ msgstr "" msgid "Installing %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" @@ -3319,111 +3329,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -117,7 +117,7 @@ msgstr "Należy podać przynajmniej jeden wzorzec" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -357,18 +357,18 @@ msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -378,7 +378,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -390,80 +390,80 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -472,17 +472,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -491,7 +491,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -500,14 +500,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -516,7 +516,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -525,30 +525,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -663,7 +663,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" @@ -780,16 +780,16 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -798,34 +798,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Logowanie się" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nie można określić nazwy zdalnego systemu" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nie udało się określić nazwy lokalnego systemu" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -833,123 +833,123 @@ msgstr "" "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, " "Acquire::ftp::ProxyLogin jest puste." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Błąd odczytu" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpowiedź przepełniła bufor." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Błąd zapisu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nie udało się utworzyć gniazda" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Nie udało się" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nie udało się połączyć pasywnego gniazda." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nie udało się przyłączyć gniazda" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nie udało się nasłuchiwać na gnieździe" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nie udało się określić nazwy gniazda" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nie można wysłać polecenia PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Nieznana rodzina adresów %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Przekroczony czas połączenia gniazda danych" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Info" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nie można wywołać " @@ -1015,39 +1015,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1055,35 +1055,35 @@ msgstr "" "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" @@ -1119,11 +1119,11 @@ msgstr "Nieznany format daty" msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -1391,101 +1391,108 @@ msgstr "Zainstalować te pakiety bez weryfikacji?" msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Zainstalowany]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1493,27 +1500,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1522,7 +1529,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[T/n]" @@ -1530,21 +1537,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1602,10 +1609,6 @@ msgstr "Gotowe" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1724,11 +1727,11 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Połączenie zostało przedwcześnie zamknięte" @@ -2051,31 +2054,38 @@ msgstr " %s nie posiada również wpisu w pliku override binariów\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nie udało się zaalokować pamięci" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nie można otworzyć %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nieprawidłowa linia %llu #1 pliku override %s" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nie udało się czytać pliku override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Nieprawidłowa linia %llu #1 pliku override %s" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Nieprawidłowa linia %llu #2 pliku override %s" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Nieprawidłowa linia %llu #3 pliku override %s" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nie udało się czytać pliku override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2103,20 +2113,20 @@ msgstr "Potomny proces kompresujący" msgid "Internal error, failed to create %s" msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" @@ -2251,12 +2261,12 @@ msgstr "Podwójne dodanie ominięcia %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" @@ -2368,7 +2378,7 @@ msgstr "" "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" "Start. Bieżąca wartość: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2377,7 +2387,7 @@ msgstr "" "Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już " "osiągnięty." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2781,7 +2791,7 @@ msgstr "Nie udało się zapisać tymczasowego pliku stanu %s" msgid "Unable to parse package file %s (1)" msgstr "Nie udało się zanalizować pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" @@ -3310,35 +3320,35 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s" msgid "Hash mismatch for: %s" msgstr "Błędna suma kontrolna dla: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nie udało się odnaleźć zadania \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto " "wirtualny" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3347,21 +3357,21 @@ msgstr "" "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " "ponieważ nie ma żadnej z nich" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on " "czysto wirtualny" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma " "kandydata" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3412,12 +3422,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalowanie %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" @@ -3438,87 +3448,87 @@ msgid "Running post-installation trigger %s" msgstr "Uruchamianie wyzwalacza post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nie udało się otworzyć pliku \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Przygotowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowywanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Pakiet %s został zainstalowany" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowywanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Pakiet %s został usunięty" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowywanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nie udało się pisać do %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3526,7 +3536,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3534,7 +3544,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3542,7 +3552,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3551,7 +3561,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -114,7 +114,7 @@ msgstr "" "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark " "showauto'." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -352,16 +352,16 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas" msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +371,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,81 +382,81 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,18 +465,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,14 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -659,7 +659,7 @@ msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" @@ -773,16 +773,16 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -791,34 +791,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, URIs locais não devem começar por //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "A identificar-se no sistema" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Não foi possível determinar o nome do posto" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Não foi possível determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a ligação e respondeu: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, o servidor respondeu: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, o servidor respondeu: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -826,121 +826,121 @@ msgstr "" "Foi especificado um servidor de proxy mas não um script de login, Acquire::" "ftp::ProxyLogin está vazio." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, o servidor respondeu: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Foi atingido o tempo limite de ligação" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível ligar socket de dados, a ligação expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Não foi possível ligar socket passivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Não foi possível fazer o bind a um socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Não foi possível executar listen no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Não foi possível enviar o comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, o servidor respondeu: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Ligação de socket de dados expirou" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Expirou o tempo do socket de dados" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "A transferência de dados falhou, o servidor respondeu '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Não foi possível invocar " @@ -1006,40 +1006,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1047,35 +1047,35 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" @@ -1111,11 +1111,11 @@ msgstr "Formato de data desconhecido" msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erro interno" @@ -1367,101 +1367,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1469,27 +1476,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1498,7 +1505,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1506,21 +1513,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "N" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1578,10 +1585,6 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1696,11 +1699,11 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" @@ -2023,31 +2026,38 @@ msgstr " %s também não possui entrada binária de 'override'\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falhou alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Não foi possível abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s malformado linha %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Falhou ler o ficheiro override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Override %s malformado linha %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Override %s malformado linha %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Override %s malformado linha %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falhou ler o ficheiro override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2075,20 +2085,20 @@ msgstr "Compactar filho" msgid "Internal error, failed to create %s" msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Falhou o IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" @@ -2223,12 +2233,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" @@ -2340,7 +2350,7 @@ msgstr "" "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-" "Start. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2349,7 +2359,7 @@ msgstr "" "Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já " "foi alcançado." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2757,7 +2767,7 @@ msgstr "Falha escrever ficheiro temporário StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" @@ -3304,33 +3314,33 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s" msgid "Hash mismatch for: %s" msgstr "Hash não coincide para: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Não foi encontrado o Release '%s' para '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Não foi encontrada a versão '%s' para '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Não foi possível encontrar a tarefa '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3339,21 +3349,21 @@ msgstr "" "Não pode seleccionar a versão instalada nem a versão candidata do pacote " "'%s' pois não tem nenhuma destas" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Não foi possível seleccionar a versão mais recente a partir do pacote '%s' " "já que é puramente virtual" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Não é possível seleccionar a versão candidata do pacote %s já que não tem " "candidato" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3402,12 +3412,12 @@ msgstr "" msgid "Installing %s" msgstr "A instalar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "A remover %s" @@ -3428,87 +3438,87 @@ msgid "Running post-installation trigger %s" msgstr "A correr o 'trigger' de pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directório '%s'" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir ficheiro o '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Não conseguiu escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3516,7 +3526,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3524,7 +3534,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3532,7 +3542,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3541,7 +3551,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 24c4ae30c..c2211ccd0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -113,7 +113,7 @@ msgstr "Você deve passar exatamente um padrão" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -356,23 +356,23 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas" msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -380,97 +380,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,14 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando em %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -651,7 +651,7 @@ msgstr "%s já é a versão mais nova.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" @@ -744,16 +744,16 @@ msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -762,34 +762,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválida, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Efetuando login" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Impossível determinar o nome do ponto" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Impossível determinar o nome local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "O servidor recusou a conexão e disse: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER falhou, servidor disse: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS falhou, servidor disse: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -797,121 +797,121 @@ msgstr "" "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::" "ProxyLogin está vazio." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Comando de script de login '%s' falhou, servidor disse: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, servidor disse: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Conexão expirou" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Erro de leitura" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Uma resposta sobrecarregou o buffer" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível conectar um socket de dados, conexão expirou" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Falhou" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Não foi possível conectar um socket passivo." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Não foi possível fazer \"bind\" de um socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Não foi possível ouvir no socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Impossível enviar o comando PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, servidor disse: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Conexão do socket de dados expirou" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossível obter arquivo, servidor disse '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Socket de dados expirou" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferência de dados falhou, servidor disse '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Impossível invocar " @@ -977,18 +977,18 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -996,22 +996,22 @@ msgstr "" "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1019,35 +1019,35 @@ msgstr "" "As assinaturas a seguir não puderam ser verificadas devido à chave pública " "não estar disponível:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" @@ -1083,11 +1083,11 @@ msgstr "Formato de data desconhecido" msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erro interno" @@ -1342,101 +1342,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1445,27 +1452,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1474,7 +1481,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[S/n]" @@ -1482,21 +1489,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1554,10 +1561,6 @@ msgstr "Pronto" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1668,11 +1671,11 @@ msgstr "Não foi possível abrir arquivo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Falhou ao criar pipe IPC para sub-processo" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" @@ -1999,31 +2002,38 @@ msgstr " %s também não possui entrada override binária\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override malformado %s linha %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Falha ao ler o arquivo override %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falha ao ler o arquivo override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2051,20 +2061,20 @@ msgstr "Compactar filho" msgid "Internal error, failed to create %s" msgstr "Erro interno, falhou ao criar %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "E/S para sub-processo/arquivo falhou" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Falhou ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema removendo %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou ao renomear %s para %s" @@ -2201,12 +2211,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Falhou ao fechar arquivo %s" @@ -2318,14 +2328,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2724,7 +2734,7 @@ msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s" msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" @@ -3255,49 +3265,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Impossível achar tarefa %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Impossível achar pacote %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3345,12 +3355,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Removendo %s" @@ -3371,111 +3381,111 @@ msgid "Running post-installation trigger %s" msgstr "Executando gatilho pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Diretório '%s' está faltando" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Impossível escrever para %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -115,7 +115,7 @@ msgstr "Trebuie să dați exact un șablon" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -354,23 +354,23 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -378,97 +378,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +511,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -650,7 +650,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" @@ -743,16 +743,16 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -761,34 +761,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Se autentifică" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nu se poate detecta numele perechii" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nu s-a putut detecta numele local" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Serverul a refuzat conexiunea și a spus: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "„USER” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "„PASS” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -796,123 +796,123 @@ msgstr "" "Un server proxy a fost precizat, dar nu există nici un script de conectare, " "Acquire::ftp::ProxyLogin este gol." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "„TYPE” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Timpul de conectare a expirat" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Eroare de citire" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Un răspuns a depășit zona de tampon." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Eroare de scriere" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nu s-a putut crea un socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " "expirat" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Eșec" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nu s-a putut realiza conectarea la un socket pasiv" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nu s-a putut realiza asocierea la un socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Nu s-a putut asculta pe socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Nu s-a putut detecta numele socket-ului" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Nu s-a putut trimite comanda PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familie de adrese necunoscută %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "„EPRT” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Timpul de conectare la socket-ul de date expirat" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Timp expirat pentru socket-ul de date" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferul de date a eșuat, serverul a spus: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Interogare" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nu s-a putut invoca" @@ -979,40 +979,40 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1020,36 +1020,36 @@ msgstr "" "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " "este disponibilă:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" @@ -1085,11 +1085,11 @@ msgstr "Format dată necunoscut" msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Eroare internă" @@ -1348,101 +1348,108 @@ msgstr "Instalați aceste pachete fără verificare?" msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1450,27 +1457,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1479,7 +1486,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1487,21 +1494,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1559,10 +1566,6 @@ msgstr "Terminat" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1674,11 +1677,11 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" @@ -2007,31 +2010,38 @@ msgstr " %s nu are nici intrare binară de înlocuire\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Eșec la alocarea memoriei" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nu s-a putut deschide %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Înlocuire greșită %s linia %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Înlocuire greșită %s linia %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Înlocuire greșită %s linia %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2059,20 +2069,20 @@ msgstr "Comprimare copil" msgid "Internal error, failed to create %s" msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" @@ -2210,12 +2220,12 @@ msgstr "Adăugare dublă de redirectare %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" @@ -2328,14 +2338,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2734,7 +2744,7 @@ msgstr "Eșec la scrierea fișierului temporar de stare %s" msgid "Unable to parse package file %s (1)" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" @@ -3261,49 +3271,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Nu s-a putut găsi sarcina %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3351,12 +3361,12 @@ msgstr "" msgid "Installing %s" msgstr "Se instalează %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Se șterge %s" @@ -3377,111 +3387,111 @@ msgid "Running post-installation trigger %s" msgstr "Se rulează declanșatorul post-instalare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Directorul „%s” lipsește." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Nu s-a putut scrie în %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -120,7 +120,7 @@ msgstr "Вы должны задать не менее одно шаблона msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" @@ -164,7 +164,7 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,17 +355,17 @@ msgstr "Внутренняя ошибка, решатель проблем вс msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -374,7 +374,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -385,80 +385,80 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,17 +467,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -662,7 +662,7 @@ msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" @@ -778,16 +778,16 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -796,34 +796,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Неправильный URI, локальный URI не должен начинаться с //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Вход в систему" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Невозможно определить имя удалённого сервера" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Невозможно определить локальное имя" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер разорвал соединение и сообщил: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Команда USER не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Команда PASS не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,125 +831,125 @@ msgstr "" "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::" "ProxyLogin пуст." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: " "%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Команда TYPE не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Допустимое время ожидания для соединения истекло" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Ошибка чтения" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Ответ переполнил буфер." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Ошибка записи" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Не удалось создать сокет" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "" "Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Неудачно" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Невозможно присоединить пассивный сокет" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Вызов getaddrinfo не смог получить сокет" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Невозможно присоединиться к сокету" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Не удалось принимать соединения на сокете" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Не удалось определить имя сокета" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Невозможно послать команду PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестное семейство адресов %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Команда EPRT не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Время установления соединения для сокета данных истекло" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Невозможно получить файл, сервер сообщил: «%s»" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Время ожидания соединения для сокета данных истекло" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Запрос" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Невозможно вызвать " @@ -1015,38 +1015,38 @@ msgstr "Что-то странное произошло при определе msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1054,35 +1054,35 @@ msgstr "" "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" @@ -1118,11 +1118,11 @@ msgstr "Неизвестный формат данных" msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -1385,102 +1385,109 @@ msgstr "Установить эти пакеты без проверки?" msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Установлен]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " или" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1495,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1517,7 +1524,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[Д/н]" @@ -1525,21 +1532,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "н" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1599,10 +1606,6 @@ msgstr "Готово" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1718,11 +1721,11 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" @@ -2047,31 +2050,38 @@ msgstr " Нет записи binary override для %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc — не удалось выделить память" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Не удалось прочесть файл переназначений (override) %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не удалось прочесть файл переназначений (override) %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2100,20 +2110,20 @@ msgstr "Процесс-потомок, производящий сжатие" msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" @@ -2248,12 +2258,12 @@ msgstr "Двойное добавление diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Повторно указан файл настройки %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" @@ -2365,7 +2375,7 @@ msgstr "" "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. " "Текущее значение: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2373,7 +2383,7 @@ msgid "" msgstr "" "Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2782,7 +2792,7 @@ msgstr "Не удалось записать временный StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Невозможно разобрать содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" @@ -3318,33 +3328,33 @@ msgstr "Не удалось найти аутентификационную за msgid "Hash mismatch for: %s" msgstr "Не совпадает хеш сумма для: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Выпуск «%s» для «%s» не найден" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия «%s» для «%s» не найдена" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Не удалось найти задачу «%s»" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3353,21 +3363,21 @@ msgstr "" "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " "как в нём нет ни той, ни другой" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " "виртуальный" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " "кандидатов" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3416,12 +3426,12 @@ msgstr "" msgid "Installing %s" msgstr "Устанавливается %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Настраивается %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Удаляется %s" @@ -3442,87 +3452,87 @@ msgid "Running post-installation trigger %s" msgstr "Выполняется послеустановочный триггер %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Отсутствует каталог «%s»" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Не удалось открыть файл «%s»" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для настройки %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Невозможно записать в %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3530,7 +3540,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3538,7 +3548,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3546,7 +3556,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3555,7 +3565,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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" @@ -116,7 +116,7 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark " "showauto“." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -351,16 +351,16 @@ msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -370,7 +370,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -382,80 +382,80 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na " "zostavenie" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti na zostavenie %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,20 +483,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -651,7 +651,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" @@ -764,16 +764,16 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -782,34 +782,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokálne URI nesmie začínať s //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prihlasovanie" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Nedá sa zistiť názov druhej strany" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Nedá sa zistiť lokálny názov" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamietol naše spojenie s chybou: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Zlyhalo zadanie hesla, server odpovedal: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,121 +817,121 @@ msgstr "" "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::" "ProxyLogin je prázdny." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Uplynul čas spojenia" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Chyba pri čítaní" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odpoveď preplnila zásobník." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Chyba pri zápise" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Nedá sa vytvoriť socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Chyba" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Nedá sa pripojiť pasívny socket." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal počúvajúci socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Nedá sa nadviazať socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Na sockete sa nedá počúvať" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Názov socketu sa nedá zistiť" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Príkaz PORT sa nedá odoslať" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznáma rodina adries %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Uplynulo spojenie dátového socketu" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -997,36 +997,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1034,35 +1034,35 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" @@ -1098,11 +1098,11 @@ msgstr "Neznámy formát dátumu" msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Vnútorná chyba" @@ -1362,101 +1362,108 @@ msgstr "Nainštalovať tieto nekontrolované balíky?" msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nainštalovaný]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1464,27 +1471,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1493,7 +1500,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1501,21 +1508,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1573,10 +1580,6 @@ msgstr "Hotovo" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1692,11 +1695,11 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" @@ -2013,31 +2016,38 @@ msgstr " %s nemá žiadnu položku „binary override“\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Nedá sa otvoriť %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Skomolený „override“ %s riadok %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nepodarilo sa prečítať „override“ súbor %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Skomolený „override“ %s riadok %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Skomolený „override“ %s riadok %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Skomolený „override“ %s riadok %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepodarilo sa prečítať „override“ súbor %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2065,20 +2075,20 @@ msgstr "Komprimovať potomka" msgid "Internal error, failed to create %s" msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" @@ -2212,12 +2222,12 @@ msgstr "Dvojité pridanie diverzie %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -2329,7 +2339,7 @@ msgstr "" "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-" "Start. Aktuálna hodnota: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2337,7 +2347,7 @@ msgid "" msgstr "" "Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2747,7 @@ msgstr "Nie je možné zapísať dočasný StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" @@ -3261,32 +3271,32 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s" msgid "Hash mismatch for: %s" msgstr "Nezhoda kontrolných haš súčtov: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Nebolo možné nájsť úlohu „%s“" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3295,20 +3305,20 @@ msgstr "" "Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, " "pretože nemá žiadnu z nich" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto " "virtuálny" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3357,12 +3367,12 @@ msgstr "" msgid "Installing %s" msgstr "Inštaluje sa %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" @@ -3383,87 +3393,87 @@ msgid "Running post-installation trigger %s" msgstr "Vykonáva sa spúšťač post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Adresár „%s“ chýba" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Nedá sa otvoriť súbor „%s“" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Do %s sa nedá zapisovať" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3471,7 +3481,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3479,7 +3489,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3487,7 +3497,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3496,7 +3506,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\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" @@ -114,7 +114,7 @@ msgstr "Podati morate vsaj en iskalni vzorec" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,17 +349,17 @@ msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -368,7 +368,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -379,80 +379,80 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -461,17 +461,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,20 +479,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,7 +501,7 @@ msgstr "" "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:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -510,30 +510,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -647,7 +647,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@ -759,16 +759,16 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi." msgid "Disk not found." msgstr "Diska ni mogoče najti." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -777,34 +777,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Prijavljanje" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni mogoče ugotoviti imena gostitelja" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ni mogoče določiti krajevnega imena" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Strežnik je zavrnil povezavo in sporočil: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -812,121 +812,121 @@ msgstr "" "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::" "ftp::ProxyLogin je prazen." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Povezava je zakasnela" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Napaka branja" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Odgovor je prekoračil predpomnilnik." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Napaka pisanja" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Ni mogoče ustvariti vtiča" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Spodletelo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Ni mogoče povezat pasivnega vtiča." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Ni mogoče povezati vtiča" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Ni mogoče poslušati na vtiču" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Ni mogoče določiti imena vtiča" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Ni mogoče poslati ukaza PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznan naslov družine %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Povezava podatkovne vtičnice je zakasnela" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Podatkovna vtič je potekel" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Poizvedba" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Ni mogoče klicati " @@ -992,72 +992,72 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" @@ -1093,11 +1093,11 @@ msgstr "Neznana oblika datuma" msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Notranja napaka" @@ -1361,101 +1361,108 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?" msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nameščeno]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1463,27 +1470,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1492,7 +1499,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1500,21 +1507,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1572,10 +1579,6 @@ msgstr "Opravljeno" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1692,11 +1695,11 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -2014,31 +2017,38 @@ msgstr " %s nima tudi binarnega vnosa prepisa\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka med dodeljevanjem pomnilnika" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ni mogoče odpreti %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Napaka med branjem prepisane datoteke %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Napaka med branjem prepisane datoteke %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2066,20 +2076,20 @@ msgstr "Podrejeni predmet stiskanja" msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "VI podopravila/datoteke je spodletel" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Med računanjem MD5 ni mogoče brati" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" @@ -2215,12 +2225,12 @@ msgstr "Dvojni seštevek odklona %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Zapisovanje datoteke %s je spodletelo" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" @@ -2332,7 +2342,7 @@ msgstr "" "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. " "Trenutna vrednost: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2340,7 +2350,7 @@ msgid "" msgstr "" "Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2739,7 +2749,7 @@ msgstr "Pisanje začasne DatotekeStanja %s je spodletelo" msgid "Unable to parse package file %s (1)" msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" @@ -3270,32 +3280,32 @@ msgstr "Ni mogoče najti zapisa overitve za: %s" msgid "Hash mismatch for: %s" msgstr "Neujemanje razpršila za: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Različice '%s' za '%s' ni mogoče najti" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Ni mogoče najti naloge '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3304,19 +3314,19 @@ msgstr "" "Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa " "'%s', saj nima nobenega od njiju" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma " "navidezen" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen" @@ -3363,12 +3373,12 @@ msgstr "" msgid "Installing %s" msgstr "Nameščanje %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Odstranjevanje %s" @@ -3389,88 +3399,88 @@ msgid "Running post-installation trigger %s" msgstr "Poganjanje sprožilca po namestitvi %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Mapa '%s' manjka" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Ni mogoče odpreti datoteke '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Pripravljanje %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Razširjanje %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Pripravljanje na nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s je bil nameščen" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravljanje na odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s je bil odstranjen" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravljanje na popolno odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni mogoče pisati na %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3478,7 +3488,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3486,7 +3496,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3494,7 +3504,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3502,7 +3512,7 @@ msgstr "" "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " "na krajevnem sistemu" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -114,7 +114,7 @@ msgstr "Du måste ange minst ett sökmönster" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -350,16 +350,16 @@ msgstr "Internt fel, problemlösaren förstörde någonting" msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -369,7 +369,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -380,95 +380,95 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -477,7 +477,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -486,14 +486,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +502,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,31 +511,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -650,7 +650,7 @@ msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" @@ -743,16 +743,16 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Skivan hittades inte." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -761,34 +761,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ogiltig URI, lokala URI:er får inte börja med //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Loggar in" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Kunde inte fastställa namnet på partnern" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Kunde inte fastställa det lokala namnet" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER misslyckades, servern sade: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -796,122 +796,122 @@ msgstr "" "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" "ProxyLogin är tom." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Tidsgränsen för anslutningen överskreds" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Läsfel" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Kunde inte skapa ett uttag (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Misslyckades" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Kunde inte ansluta passivt uttag (socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Kunde inte binda ett uttag (socket)" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Kunde inte lyssna på uttaget (socket)" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Kunde inte fastställa uttagets namn (socket)" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Kunde inte sända PORT-kommando" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Okänd adressfamilj %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT misslyckades, servern sade: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" # Statusmeddelande, byter från substantiv till verb #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Frågar" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Kunde inte starta " @@ -981,39 +981,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1021,35 +1021,35 @@ msgstr "" "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " "tillgänglig:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" @@ -1085,11 +1085,11 @@ msgstr "Okänt datumformat" msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Internt fel" @@ -1345,101 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?" msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installerat]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1447,27 +1454,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1476,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[J/n]" @@ -1484,21 +1491,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1556,10 +1563,6 @@ msgstr "Färdig" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1680,11 +1683,11 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" @@ -2007,32 +2010,40 @@ msgstr " %s har heller ingen binär åsidosättningspost\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Felaktig override %s rad %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Misslyckades med att läsa åsidosättningsfilen %s" + +# parametrar: filnamn, radnummer +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Misslyckades med att läsa åsidosättningsfilen %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2061,20 +2072,20 @@ msgstr "Barnprocess för komprimering" msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" @@ -2209,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" @@ -2326,7 +2337,7 @@ msgstr "" "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. " "Aktuellt värde: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2335,7 +2346,7 @@ msgstr "" "Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har " "uppnåtts." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2737,7 +2748,7 @@ msgstr "Misslyckades med att skriva temporär StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" @@ -3260,33 +3271,33 @@ msgstr "Kan inte hitta autentiseringspost för: %s" msgid "Hash mismatch for: %s" msgstr "Hash-kontrollsumman stämmer inte för: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Kunde inte hitta funktionen \"%s\"" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3295,21 +3306,21 @@ msgstr "" "Kan inte välja installerad version eller kandidatversion från paketet \"%s\" " "eftersom det inte har någon av dem" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Kan inte välja senaste version från paketet \"%s\" eftersom det är helt " "virtuellt" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Kan inte välja kandidatversion från paketet %s eftersom det inte har någon " "kandidat" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3359,12 +3370,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerar %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Tar bort %s" @@ -3385,87 +3396,87 @@ msgid "Running post-installation trigger %s" msgstr "Kör efterinstallationsutlösare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Kunde inte skriva till %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3473,7 +3484,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3481,7 +3492,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3489,7 +3500,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3498,7 +3509,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -112,7 +112,7 @@ msgstr "คุณต้องระบุแพตเทิร์นสำหร msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -344,16 +344,16 @@ msgstr "เกิดข้อผิดพลาดภายใน: กลไก msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -362,7 +362,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -373,78 +373,78 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -452,17 +452,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -470,19 +470,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -491,37 +491,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, 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:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -635,7 +635,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" @@ -745,16 +745,16 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร msgid "Disk not found." msgstr "ไม่พบแผ่น" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -763,154 +763,154 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI ไม่ถูกต้อง URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "เข้าระบบ" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "คำตอบท่วมบัฟเฟอร์" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "ไม่สามารถสร้างซ็อกเก็ต" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "ล้มเหลว" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "ไม่สามารถ bind ซ็อกเก็ต" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "ไม่สามารถส่งคำสั่ง PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "สอบถาม" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " @@ -976,70 +976,70 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" @@ -1075,11 +1075,11 @@ msgstr "พบรูปแบบวันที่ที่ไม่รู้จ msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -1318,101 +1318,108 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [ติดตั้งอยู่]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1420,27 +1427,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1449,7 +1456,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1457,21 +1464,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1529,10 +1536,6 @@ msgstr "เสร็จแล้ว" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1646,11 +1649,11 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" @@ -1960,31 +1963,38 @@ msgstr " %s ไม่มีข้อมูล override สำหรับไบ msgid "realloc - Failed to allocate memory" msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "ไม่สามารถเปิด %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "ไม่สามารถอ่านแฟ้ม override %s" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ไม่สามารถอ่านแฟ้ม override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2012,20 +2022,20 @@ msgstr "โพรเซสลูกสำหรับบีบอัด" msgid "Internal error, failed to create %s" msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" @@ -2160,12 +2170,12 @@ msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" msgid "Duplicate conf file %s/%s" msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" @@ -2277,14 +2287,14 @@ msgstr "" "MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start ค่าปัจจุบัน: %lu (man 5 " "apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ" @@ -2679,7 +2689,7 @@ msgstr "ไม่สามารถเขียนแฟ้มสถานะช msgid "Unable to parse package file %s (1)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" @@ -3195,32 +3205,32 @@ msgstr "ไม่พบระเบียนยืนยันความแท msgid "Hash mismatch for: %s" msgstr "แฮชไม่ตรงกันสำหรับ: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "ไม่พบงานติดตั้ง '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3228,17 +3238,17 @@ msgid "" msgstr "" "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" @@ -3283,12 +3293,12 @@ msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้ msgid "Installing %s" msgstr "กำลังติดตั้ง %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" @@ -3309,113 +3319,113 @@ msgid "Running post-installation trigger %s" msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "ไม่สามารถเปิดแฟ้ม '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -118,7 +118,7 @@ msgstr "Kailangan niyong magbigay ng isa lamang na pattern" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -357,23 +357,23 @@ msgstr "Error na internal, may nasira ang problem resolver" msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -381,95 +381,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +478,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +487,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng " "%s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +512,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -647,7 +647,7 @@ msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" @@ -740,16 +740,16 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -758,34 +758,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Pumapasok" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Hindi malaman ang pangalan ng peer" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Hindi malaman ang pangalang lokal" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Bigo ang PASS, sabi ng server ay: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -793,121 +793,121 @@ msgstr "" "May tinakdang katuwang na server ngunit walang login script, walang laman " "ang Acquire::ftp::ProxyLogin." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Bigo ang TYPE, sabi ng server ay: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Lumipas ang koneksyon" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Error sa pagbasa" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "May sagot na bumubo sa buffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Error sa pagsulat" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Hindi maka-likha ng socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Bigo" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Hindi maka-konekta sa socket na passive." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "di makakuha ang getaddrinfo ng socket na nakikinig" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Hindi maka-bind ng socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Hindi makarinig sa socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Hindi malaman ang pangalan ng socket" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Hindi makapagpadala ng utos na PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Di kilalang pamilya ng address %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Bigo ang EPRT, sabi ng server ay: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Tanong" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Hindi ma-invoke " @@ -973,40 +973,40 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1014,35 +1014,35 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" @@ -1078,11 +1078,11 @@ msgstr "Di kilalang anyo ng petsa" msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Internal na error" @@ -1332,101 +1332,108 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nakaluklok]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " o" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1434,27 +1441,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1463,7 +1470,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[O/h]" @@ -1471,21 +1478,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "H" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1543,10 +1550,6 @@ msgstr "Tapos" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1657,11 +1660,11 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" @@ -1987,31 +1990,38 @@ msgstr " %s ay wala ring override entry na binary\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Hindi mabuksan %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Maling anyo ng override %s linya %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Bigo ang pagbasa ng talaksang override %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Maling anyo ng override %s linya %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Bigo ang pagbasa ng talaksang override %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2039,20 +2049,20 @@ msgstr "Anak para sa pag-Compress" msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" @@ -2188,12 +2198,12 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" @@ -2306,14 +2316,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2717,7 +2727,7 @@ msgstr "Bigo sa pagsulat ng talaksang %s" msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" @@ -3243,49 +3253,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Di tugmang MD5Sum" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3333,12 +3343,12 @@ msgstr "" msgid "Installing %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" @@ -3359,111 +3369,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish\n" @@ -116,7 +116,7 @@ msgstr "" "Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' " "komutunu kullanın." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi bulunamadı" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -353,16 +353,16 @@ msgstr "İç hata, sorun çözücü nesneyi bozdu" msgid "Unable to lock the download directory" msgstr "İndirme dizini kilitlenemiyor" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +372,7 @@ msgstr "" "yapılmaktadır:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -384,78 +384,78 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB kaynak arşivi indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -464,17 +464,17 @@ msgstr "" "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " "rehber sayfasındaki APT::Architectures kısmına göz atın." -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -483,7 +483,7 @@ msgstr "" "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " "bağımlılığı karşılanamıyor." -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -491,12 +491,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,7 @@ msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " "gerekli sürüm şartlarını karşılamıyor" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s için inşa bağımlılıkları karşılanamadı." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -653,7 +653,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" @@ -766,16 +766,16 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir." msgid "Disk not found." msgstr "Disk bulunamadı." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -784,34 +784,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Giriş yapılıyor" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Eş adı belirlenemiyor" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Yerel ad belirlenemiyor" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -819,121 +819,121 @@ msgstr "" "Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::" "ftp::ProxyLogin boş." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Sunucu bağlantıyı kesti" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Okuma hatası" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Bir yanıt arabelleği taşırdı." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Yazma hatası" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Bir soket oluşturulamadı" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Başarısız" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Edilgen sokete bağlanılamadı." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo bir dinleme soketi alamıyor" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Bir sokete bağlanılamadı" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Soket dinlenemedi" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Soketin adı belirlenemedi" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "PORT komutu gönderilemedi" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Bilinmeyen adres ailesi %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Veri soketi bağlantısı zaman aşımına uğradı" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Bağlantı kabul edilemiyor" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Veri soketi zaman aşımına uğradı" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Sorgu" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Çağrılamıyor " @@ -999,70 +999,70 @@ msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti" msgid "Unable to connect to %s:%s:" msgstr "Bağlanılamıyor %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "En az bir geçersiz imza ile karşılaşıldı." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv çalıştırılırken bilinmeyen hata" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Aşağıdaki imzalar geçersiz:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Sunucundan okunurken hata" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Seçme başarısız" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Çıktı dosyasına yazılırken hata" @@ -1098,11 +1098,11 @@ msgstr "Bilinmeyen tarih biçimi" msgid "Bad header data" msgstr "Kötü başlık verisi" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Bağlantı başarısız" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "İç hata" @@ -1358,101 +1358,108 @@ msgstr "Paketler doğrulanmadan kurulsun mu?" msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Kuruldu]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1460,27 +1467,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1489,7 +1496,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[E/h]" @@ -1497,21 +1504,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "H" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1571,10 +1578,6 @@ msgstr "Bitti" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1689,11 +1692,11 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Bağlantı vaktinden önce kapandı" @@ -2016,31 +2019,38 @@ msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Bellek ayırma yapılamadı" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "%s açılamıyor" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Hatalı geçersiz kılma %s satır %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Geçersiz kılma dosyası %s okunamadı" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Hatalı geçersiz kılma %s satır %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Hatalı geçersiz kılma %s satır %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Geçersiz kılma dosyası %s okunamadı" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2068,20 +2078,20 @@ msgstr "Çocuğu sıkıştır" msgid "Internal error, failed to create %s" msgstr "İç hata, %s oluşturulamadı" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "MD5 hesaplanırken okunamadı" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" @@ -2217,12 +2227,12 @@ msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "%s dosyasına yazılamadı" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" @@ -2335,14 +2345,14 @@ msgstr "" "Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu " "kullanın)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2747,7 +2757,7 @@ msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu" msgid "Unable to parse package file %s (1)" msgstr "Paket dosyası %s ayrıştırılamadı (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Paket dosyası %s ayrıştırılamadı (2)" @@ -3287,32 +3297,32 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı." msgid "Hash mismatch for: %s" msgstr "Sağlama yapılamadı: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "'%s' görevi bulunamadı" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3321,17 +3331,17 @@ msgstr "" "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " "seçilemiyor" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor" @@ -3378,12 +3388,12 @@ msgstr "" msgid "Installing %s" msgstr "%s kuruluyor" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "%s yapılandırılıyor" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" @@ -3404,88 +3414,88 @@ msgid "Running post-installation trigger %s" msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "'%s' dizini bulunamadı" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "'%s' dosyası açılamadı" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "%s hazırlanıyor" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "%s paketi açılıyor" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "%s paketini yapılandırmaya hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "%s kuruldu" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "%s paketinin kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "%s kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "%s tamamen kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "%s dosyasına yazılamıyor" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3493,14 +3503,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3508,7 +3518,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3516,7 +3526,7 @@ msgid "" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -121,7 +121,7 @@ msgstr "Ви повинні задати не менше одного шабло msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" @@ -165,7 +165,7 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -355,18 +355,18 @@ msgstr "Внутрішня помилка, вирішувач проблем щ msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +375,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -386,81 +386,81 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -469,17 +469,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +488,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -663,7 +663,7 @@ msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" @@ -777,17 +777,17 @@ msgstr "" msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -796,34 +796,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Логінюсь в" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Неможливо визначити назву вузла" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Неможливо визначити локальну назву" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Сервер розірвав з'єднання, відповівши: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER невдало, сервер мовив: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS невдало, сервер мовив: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -831,121 +831,121 @@ msgstr "" "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin " "пустий." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE невдало, сервер мовив: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Час з'єднання вичерпався" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Помилка зчитування" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Відповідь переповнила буфер." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Помилка запису" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Неможливо створити сокет (socket)" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Невдача" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Неможливо під'єднати пасивний сокет (passive socket)." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Неможливо приєднатися до сокета" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Неможливо прослухати на сокеті" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Не вдалося визначити назву сокета" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Неможливо відіслати команду PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Невідоме адресове сімейство %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT невдало, сервер мовив: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Час з'єднання з сокетом даних вичерпався" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Проблема хешування файла" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача даних обірвалася, сервер мовив '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Черга" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Неможливо викликати " @@ -1011,38 +1011,38 @@ msgstr "Сталося щось дивне при спробі отримати msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Наступні підписи були невірними:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1050,35 +1050,35 @@ msgstr "" "Наступні підписи не можуть бути перевірені, тому що публічний ключ " "відсутній:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" @@ -1114,11 +1114,11 @@ msgstr "Невідомий формат дати" msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Внутрішня помилка" @@ -1379,101 +1379,108 @@ msgstr "Встановити ці пакунки без перевірки?" msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Встановлено]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1481,27 +1488,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1510,7 +1517,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1518,21 +1525,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1591,10 +1598,6 @@ msgstr "Виконано" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1710,11 +1713,11 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" @@ -2044,31 +2047,38 @@ msgstr " Крім того, відсутній запис про бінарне msgid "realloc - Failed to allocate memory" msgstr "realloc - Не вдалося виділити пам'ять" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Не вдалося відкрити %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Не вдалося прочитати файл перепризначень (override) %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не вдалося прочитати файл перепризначень (override) %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2096,20 +2106,20 @@ msgstr "Процес-нащадок, що виконує пакування" msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Помилка зчитування під час обчислення MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" @@ -2248,12 +2258,12 @@ msgstr "Подвійне додавання diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" @@ -2367,7 +2377,7 @@ msgstr "" "Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::" "Cache-Start. Поточне значення: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2375,7 +2385,7 @@ msgid "" msgstr "" "Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2782,7 +2792,7 @@ msgstr "Не вдалося записати до тимчасового StateFi msgid "Unable to parse package file %s (1)" msgstr "Неможливо проаналізувати файл пакунку %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неможливо проаналізувати файл пакунку %s (2)" @@ -3310,32 +3320,32 @@ msgstr "Неможливо знайти аутентифікаційний за msgid "Hash mismatch for: %s" msgstr "Невідповідність хешу для: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Випуск '%s' для '%s' не знайдено" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Неможливо знайти завдання '%s'" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3344,19 +3354,19 @@ msgstr "" "Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " "так як вони відсутні" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " "віртуальним" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3411,12 +3421,12 @@ msgstr "" msgid "Installing %s" msgstr "Встановлюється %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Налаштовується %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Видаляється %s" @@ -3437,89 +3447,89 @@ msgid "Running post-installation trigger %s" msgstr "Виконується післяустановочний ініціатор %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Директорія '%s' відсутня" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Неможливо відкрити файл '%s'" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Підготовка до видалення %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Неможливо записати в %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3527,7 +3537,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3535,7 +3545,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3543,7 +3553,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -3552,7 +3562,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2014-01-01 13:45+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -117,7 +117,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế." -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Không thể xác định vị trí của gói %s" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -362,16 +362,16 @@ msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -381,7 +381,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -392,79 +392,79 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Gặp lỗi khi lấy một số kho." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh biên dịch “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -473,17 +473,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi biên dịch.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -492,7 +492,7 @@ msgstr "" "Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên " "gói “%s”" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -500,14 +500,14 @@ msgid "" msgstr "" "Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là " "quá mới" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -516,7 +516,7 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -525,30 +525,30 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -669,7 +669,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" @@ -799,16 +799,16 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang msgid "Disk not found." msgstr "Không tìm thấy đĩa." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -817,34 +817,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Đang đăng nhập vào" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Không thể quyết định tên ngang hàng" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Không thể phân giải tên cục bộ" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -852,121 +852,121 @@ msgstr "" "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. " "“Acquire::ftp::ProxyLogin” là rỗng." -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Thời hạn kết nối" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Lỗi đọc" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Một trả lời đã tràn bộ đệm." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Lỗi ghi" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Không thể tạo ổ cắm" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Gặp lỗi" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "Không thể kết nối ổ cắm bị động." -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Không thể đóng kết ổ cắm" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Không thể lắng nghe trên ổ cắm đó" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Không thể quyết định tên ổ cắm đó" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Không thể gửi lệnh PORT (cổng)" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Không biết họ địa chỉ %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Quá giờ kết nối ổ cắm dữ liệu" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Ổ cắm dữ liệu đã quá giờ" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Truy vấn" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Không thể gọi " @@ -1032,22 +1032,22 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - % msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: Chữ ký đúng, nhưng không thể xác định vân tay của khóa?!" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1056,50 +1056,50 @@ msgstr "" "Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải " "không?)" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây không hợp lệ:\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin đầu ra" @@ -1139,11 +1139,11 @@ msgstr "Không rõ định dạng ngày" msgid "Bad header data" msgstr "Dữ liệu phần đầu sai" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Kết nối bị lỗi" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -1389,98 +1389,105 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?" msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" msgstr "đã cài, có thể nâng cấp thành: " -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:202 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "[đã cài, có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, fuzzy, c-format +msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: " -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được cài đặt:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Những gói sau đây sẽ được thay đổi:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1495,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1517,7 +1524,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "[C/k]" @@ -1525,21 +1532,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "K" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1596,10 +1603,6 @@ msgstr "Xong" msgid "Full Text Search" msgstr "Tìm kiếm toàn văn" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1713,11 +1716,11 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng bất ngờ" @@ -2054,31 +2057,38 @@ msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai override %s dòng %llu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" + +#: ftparchive/override.cc:163 #, c-format msgid "Malformed override %s line %llu #1" msgstr "Sai override %s dòng %llu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, c-format msgid "Malformed override %s line %llu #2" msgstr "Sai override %s dòng %llu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, c-format msgid "Malformed override %s line %llu #3" msgstr "Sai override %s dòng %llu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2106,20 +2116,20 @@ msgstr "Nén con" msgid "Internal error, failed to create %s" msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" @@ -2256,12 +2266,12 @@ msgstr "Sự trệch đi được thêm hai lần %s → %s" msgid "Duplicate conf file %s/%s" msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "Việc ghi tập tin %s gặp lỗi" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s gặp lỗi" @@ -2374,14 +2384,14 @@ msgstr "" "Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" "Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2784,7 +2794,7 @@ msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tích tập tin gói %s (2)" @@ -3325,32 +3335,32 @@ msgstr "Không tìm thấy bản ghi xác thực cho: %s" msgid "Hash mismatch for: %s" msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3359,17 +3369,17 @@ msgstr "" "Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " "mà không có trong nó" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3418,12 +3428,12 @@ msgstr "" msgid "Installing %s" msgstr "Đang cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s" @@ -3444,88 +3454,88 @@ msgid "Running post-installation trigger %s" msgstr "Đang chạy bẫy sau-cài-đặt %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục “%s”" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format msgid "Can not write log (%s)" msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3533,14 +3543,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3548,7 +3558,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -3556,7 +3566,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " "thống nội bộ" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4f3edaafc..3b3e10554 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -113,7 +113,7 @@ msgstr "您必须明确地给出至少一个表达式" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -349,16 +349,16 @@ msgstr "内部错误，问题解决工具坏事了" msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -367,7 +367,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, fuzzy, c-format msgid "" "Please use:\n" @@ -378,114 +378,114 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,37 +494,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -639,7 +639,7 @@ msgstr "%s 已经是最新的版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -732,16 +732,16 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -750,155 +750,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失败" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "无法调用 " @@ -964,70 +964,70 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "写输出文件时出错" @@ -1063,11 +1063,11 @@ msgstr "无法识别的日期格式" msgid "Bad header data" msgstr "错误的报头数据" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "连接失败" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "内部错误" @@ -1303,101 +1303,108 @@ msgstr "不经验证就安装这些软件包吗？" msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [已安装]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1405,27 +1412,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1434,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1442,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1514,10 +1521,6 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1630,11 +1633,11 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -1948,31 +1951,38 @@ msgstr " %s 中没有二进制文件的 override 项\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "无法打开 %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "override 文件 %s 第 %lu 行的格式有误 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "无法读取 override 文件 %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "无法读取 override 文件 %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -2000,20 +2010,20 @@ msgstr "压缩子进程" msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -2148,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s" msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -2265,14 +2275,14 @@ msgstr "" "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 " "apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" @@ -2668,7 +2678,7 @@ msgstr "无法写入临时状态文件 %s" msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" @@ -3184,49 +3194,49 @@ msgstr "无法找到认证记录：%s" msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符：%s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, c-format msgid "Couldn't find task '%s'" msgstr "无法找到任务 %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" @@ -3273,12 +3283,12 @@ msgstr "" msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "正在删除 %s" @@ -3299,112 +3309,112 @@ msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "无法写入 %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 18aac83ea..123cef942 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -114,7 +114,7 @@ msgstr "您必須明確得給定一個樣式" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "找不到套件 %s" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -350,23 +350,23 @@ msgstr "內部錯誤，問題排除器造成了損壞" msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -374,114 +374,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -489,37 +489,37 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正和 %s (%s) 連線" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -632,7 +632,7 @@ msgstr "%s 已經是最新版本了。\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" @@ -724,16 +724,16 @@ msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。" msgid "Disk not found." msgstr "找不到磁碟。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -742,155 +742,155 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "不正確的 URI，本機 URI 不應以 // 開頭" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "登入中" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "無法解析對方主機名稱" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "無法解析本機名稱" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, c-format msgid "The server refused the connection and said: %s" msgstr "伺服器不接受連線，並回應：%s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。" -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "連線逾時" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "讀取錯誤" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "回應超過緩衝區長度。" -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "寫入錯誤" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "無法建立 Socket" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "無法和 data socket 連線，連線逾時" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "失敗" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 msgid "Could not connect passive socket." msgstr "無法和 passive socket 連線。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 無法取得監聽 socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "無法 bind 至 socket" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "無法監聽 socket" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "無法解析 socket 名稱" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "無法送出 PORT 指令" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知的地址家族 %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令失敗，伺服器回應：%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "有問題的雜湊檔" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "無法取得檔案，伺服器回應 '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Data socket 連線逾時" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "資料傳輸失敗，伺服器回應 '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "查詢" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "無法 invoke " @@ -956,71 +956,71 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事" msgid "Unable to connect to %s:%s:" msgstr "無法連線至 %s %s：" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:533 +#: methods/http.cc:530 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" @@ -1056,11 +1056,11 @@ msgstr "未知的資料格式" msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "連線失敗" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "內部錯誤" @@ -1303,101 +1303,108 @@ msgstr "是否不經驗證就安裝這些套件？" msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "【已安裝】" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr "或" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1405,27 +1412,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1434,7 +1441,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1442,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -1514,10 +1521,6 @@ msgstr "完成" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1628,11 +1631,11 @@ msgstr "無法開啟檔案 %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "無法和子程序建立 IPC 管線" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "連線突然終止" @@ -1947,31 +1950,38 @@ msgstr " %s 也沒有二元碼重新定義項目\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - 無法配置記憶體" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "無法開啟 %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "無法讀取重新定義檔 %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "無法讀取重新定義檔 %s" - #: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" @@ -1999,20 +2009,20 @@ msgstr "壓縮子程序" msgid "Internal error, failed to create %s" msgstr "內部錯誤，無法建立 %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "和子程序/檔案 IO 失敗" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "在計算 MD5 時無法讀取到資料" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "在取消 %s 的連結時發生問題" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" @@ -2146,12 +2156,12 @@ msgstr "重複加入抽換資訊 %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -2265,14 +2275,14 @@ msgstr "" "動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。" "(man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2668,7 +2678,7 @@ msgstr "無法寫入暫存的 StateFile %s" msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件檔 %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" @@ -3174,49 +3184,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "找不到 '%s' 版的 '%s'" -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "無法找到主題 %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "無法找到套件 %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3262,12 +3272,12 @@ msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而 msgid "Installing %s" msgstr "正在安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format msgid "Configuring %s" msgstr "正在設定 %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format msgid "Removing %s" msgstr "正在移除 %s" @@ -3288,111 +3298,111 @@ msgid "Running post-installation trigger %s" msgstr "正在執行安裝後套件後續處理程式 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "無法開啟檔案 %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format msgid "Preparing %s" msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format msgid "Unpacking %s" msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Preparing to configure %s" msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format msgid "Installed %s" msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format msgid "Removed %s" msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Preparing to completely remove %s" msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "無法寫入 %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 68ea1c574..acde4b096 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -42,12 +42,12 @@ testsuccess aptget autoremove -y testdpkgnotinstalled 'po-debconf' testmarkedauto -sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -testfileequal 'rootdir/var/log/apt/history.log' ' -Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic) - +sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log +testfileequal 'apt-history.log' ' +Install: debhelper:i386 (8.0.0) +Install: po-debconf:i386 (1.0.16, automatic) +Install: unrelated:i386 (1) Remove: debhelper:i386 (8.0.0) - Remove: po-debconf:i386 (1.0.16)' testsuccess aptget install debhelper -y diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index 0d92283f1..7cce6ef29 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -34,11 +34,16 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sh # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms -# deb:736962 - apt-get download foo && -aptget download apt -aptget download apt +# deb:736962 +testsuccess aptget download apt +testsuccess aptget download apt +testsuccess test -s apt_2.0_all.deb + +rm -f apt_1.0_all.deb apt_2.0_all.deb + +# deb:738103 +testsuccess aptget download apt apt apt/unstable apt=2.0 testsuccess test -s apt_2.0_all.deb -rm -f apt_1.0_all.deb # deb:738103 - apt-get download foo foo fails rm -f apt_*.deb diff --git a/test/integration/test-apt-get-source-multisources b/test/integration/test-apt-get-source-multisources new file mode 100755 index 000000000..cc759e8c1 --- /dev/null +++ b/test/integration/test-apt-get-source-multisources @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'armhf' + +insertsource 'unstable' 'adduser' 'all' '3.113+nmu3' +insertsource 'stable' 'python-fll' 'all' '0.9.11' + +insertpackage 'unstable' 'adduser' 'all' '3.113+nmu3' +insertpackage 'stable' 'python-fll' 'all' '0.9.11' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +HEADER="Reading package lists... +Building dependency tree..." +testequal "$HEADER +Need to get 0 B of source archives. +'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only adduser=3.113 python-fll=0.9.11 + +testequal "$HEADER +Need to get 0 B of source archives. +'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e +'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only python-fll=0.9.11 adduser=3.113 diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing index 2741509a7..a43354871 100755 --- a/test/integration/test-architecture-specification-parsing +++ b/test/integration/test-architecture-specification-parsing @@ -4,102 +4,106 @@ set -e TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture 'amd64' 'armel' -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 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armhf], bar [arm] -Depends: foo [armhf], bar [arm]' +# we need this construct here as it isn't really possible to fake native arch for dpkg-* tools +NATIVE="$(command dpkg --print-architecture)" +configarchitecture "${NATIVE}" 'armel' + +buildsimplenativepackage 'pkg-arch-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !${NATIVE}] +Depends: foo [${NATIVE} !${NATIVE}]" +buildsimplenativepackage 'pkg-arch-no-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!${NATIVE} ${NATIVE}] +Depends: foo [!${NATIVE} ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!kfreebsd-any ${NATIVE}] +Depends: foo [!kfreebsd-any ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !kfreebsd-any] +Depends: foo [${NATIVE} !kfreebsd-any]" +buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armeb], bar [arm] +Depends: foo [armeb], bar [arm]' -buildsimplenativepackage 'foo' 'amd64' '1.0' 'stable' +buildsimplenativepackage 'foo' "$NATIVE" '1.0' 'stable' insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign' setupaptarchive -testequal 'Reading package lists... +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 +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s -testequal 'Reading package lists... +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 +Inst pkg-arch-no-foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s -testequal 'Reading package lists... +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 +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +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 +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s -testequal 'Reading package lists... +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 +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" 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... +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 +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +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 +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s testequal 'Reading package lists... Building dependency tree... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s # this is not really testing APT - more that dpkg is in line with us +configarchitecture 'amd64' 'armel' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable new file mode 100755 index 000000000..4dbe1d25d --- /dev/null +++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable @@ -0,0 +1,86 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' 'amd64' + +insertpackage 'unstable' 'lib32nss-mdns' 'amd64' '0.10-6' 'Depends: libnss-mdns-i386 (= 0.10-6)' +insertpackage 'unstable' 'libnss-mdns' 'amd64,i386' '0.10-6' 'Multi-Arch: same +Breaks: lib32nss-mdns (<< 0.10-6)' +insertpackage 'unstable' 'libnss-mdns-i386' 'i386' '0.10-6' 'Multi-Arch: foreign +Depends: libnss-mdns' + +insertpackage 'unstable' 'foo' 'amd64' '1' 'Depends: libfoo' +insertpackage 'unstable' 'libfoo' 'amd64' '1' 'Depends: libfoo-bin' +insertpackage 'unstable' 'libfoo-bin' 'i386' '0.10-6' 'Multi-Arch: foreign' + +insertinstalledpackage 'lib32nss-mdns' 'amd64' '0.9-1' +insertinstalledpackage 'libnss-mdns' 'amd64' '0.9-1' + +insertinstalledpackage 'i-make-packages-important' 'all' '1' 'Depends: libnss-mdns' + +setupaptarchive --no-update + +# make libnss-mdns-i386 unavailable +configarchitecture 'amd64' +testsuccess aptget update + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + lib32nss-mdns +The following packages will be upgraded: + libnss-mdns +1 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Remv lib32nss-mdns [0.9-1] +Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) +Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s + +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + foo : Depends: libfoo but it is not going to be installed +E: Unable to correct problems, you have held broken packages.' aptget install foo -s + +# activate multiarch +configarchitecture 'amd64' 'i386' +testsuccess aptget update + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + libnss-mdns:i386 libnss-mdns-i386:i386 +The following packages will be upgraded: + lib32nss-mdns libnss-mdns +2 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst lib32nss-mdns [0.9-1] (0.10-6 unstable [amd64]) [] +Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) [] +Inst libnss-mdns:i386 (0.10-6 unstable [i386]) [] +Inst libnss-mdns-i386:i386 (0.10-6 unstable [i386]) +Conf libnss-mdns:i386 (0.10-6 unstable [i386]) +Conf libnss-mdns (0.10-6 unstable [amd64]) +Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386]) +Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libfoo libfoo-bin:i386 +The following NEW packages will be installed: + foo libfoo libfoo-bin:i386 +0 upgraded, 3 newly installed, 0 to remove and 2 not upgraded. +Inst libfoo-bin:i386 (0.10-6 unstable [i386]) +Inst libfoo (1 unstable [amd64]) +Inst foo (1 unstable [amd64]) +Conf libfoo-bin:i386 (0.10-6 unstable [i386]) +Conf libfoo (1 unstable [amd64]) +Conf foo (1 unstable [amd64])' aptget install foo -s diff --git a/test/integration/test-bug-737130-multicompress-file-modes b/test/integration/test-bug-737130-multicompress-file-modes new file mode 100755 index 000000000..7df6339a2 --- /dev/null +++ b/test/integration/test-bug-737130-multicompress-file-modes @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'i386' + +cat >aptarchive/ftparchive.conf <<EOF +Dir { ArchiveDir "$(pwd)/aptarchive"; CacheDir "$(pwd)/aptarchive"; }; +Default { Translation::Compress ". gzip bzip2 xz"; FileMode 0644; }; +tree "dists/sid" { + Sections "main"; + Architectures "i386"; + LongDescription "false"; +}; +EOF +mkdir -p aptarchive/dists/sid/main/binary-i386 +mkdir -p aptarchive/dists/sid/main/i18n +testsuccess aptftparchive generate aptarchive/ftparchive.conf +i18n=aptarchive/dists/sid/main/i18n +for comp in '' .gz .bz2 .xz; do + msgtest 'Test apt-ftparchive file mode is 644 for' "Translation-en$comp" + FILEMODE="$(stat --format %a "$i18n/Translation-en$comp")" + if [ "$FILEMODE" != '644' ]; then + msgfail "Mode was '$FILEMODE'!" + else + msgpass + fi +done diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade new file mode 100755 index 000000000..dc3725df1 --- /dev/null +++ b/test/integration/test-bug-multiarch-upgrade @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertinstalledpackage 'libcups2' 'amd64' '1' 'Multi-Arch: same' +insertinstalledpackage 'libcups2' 'i386' '1' 'Multi-Arch: same' + +insertpackage 'unstable' 'libcups2' 'amd64' '0' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'amd64' '2' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'i386' '0' 'Multi-Arch: same' +insertpackage 'unstable' 'libcups2' 'i386' '2' 'Multi-Arch: same' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libcups2 +The following packages will be upgraded: + libcups2 libcups2:i386 +2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst libcups2 [1] (2 unstable [amd64]) [libcups2:amd64 on libcups2:i386] [libcups2:i386 on libcups2:amd64] [libcups2:i386 ] +Inst libcups2:i386 [1] (2 unstable [i386]) +Conf libcups2 (2 unstable [amd64]) +Conf libcups2:i386 (2 unstable [i386])' aptget install -s libcups2:i386 diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index ad31511b9..afe1ad443 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -31,6 +31,16 @@ wasmergeused() { msgfail fi + msgtest 'No intermediate patch files' 'still exist' + local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')" + if [ -z "$EDS" ]; then + msgpass + else + echo + echo "$EDS" + msgfail + fi + msgtest 'Check if the right pdiff merger was used' if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then @@ -46,7 +56,7 @@ wasmergeused() { } testrun() { - # setup the base + msgmsg "Testcase: setup the base with: $*" find aptarchive -name 'Packages*' -type f -delete cp ${PKGFILE} aptarchive/Packages compressfile 'aptarchive/Packages' @@ -59,7 +69,7 @@ testrun() { testequal "$(cat ${PKGFILE}) " aptcache show apt oldstuff - msgmsg 'Testcase: apply with one patch' + msgmsg "Testcase: apply with one patch: $*" cp ${PKGFILE}-new aptarchive/Packages compressfile 'aptarchive/Packages' mkdir -p aptarchive/Packages.diff @@ -82,13 +92,13 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: index is already up-to-date' + msgmsg "Testcase: index is already up-to-date: $*" find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete testsuccess aptget update "$@" testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: apply with two patches' + msgmsg "Testcase: apply with two patches: $*" cp ${PKGFILE}-new aptarchive/Packages echo ' Package: futurestuff @@ -129,7 +139,7 @@ SHA1-Patches: testequal "$(cat Packages-future) " aptcache show apt newstuff futurestuff - msgmsg 'Testcase: patch applying fails, but successful fallback' + msgmsg "Testcase: patch applying fails, but successful fallback: $*" rm -rf rootdir/var/lib/apt/lists cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists cp ${PKGFILE}-new aptarchive/Packages @@ -154,6 +164,10 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff } +echo 'Debug::pkgAcquire::Diffs "true"; +Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0 -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index 7f3b05e59..5856cd744 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -15,19 +15,18 @@ Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-ga insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core Provides: libreoffice-style' -buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)' -buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4) +insertpackage 'sid' 'libreoffice' 'amd64' '4' 'Depends: libreoffice-core (= 4)' +insertpackage 'sid' 'libreoffice-core' 'amd64' '4' 'Depends: libreoffice-common (>= 4) Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)' -buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure +insertpackage 'sid' 'libreoffice-common' 'all' '4' 'Depends: libreoffice-style, ure Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)' -buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core +insertpackage 'sid' 'libreoffice-style-galaxy' 'amd64' '4' 'Depends: libreoffice-core Provides: libreoffice-style' - -buildsimplenativepackage 'ure' 'amd64' '4' 'sid' +insertpackage 'sid' 'ure' 'amd64' '4' setupaptarchive -testequal 'Reading package lists... +testequalor2 'Reading package lists... Building dependency tree... The following NEW packages will be installed: ure @@ -43,4 +42,20 @@ Conf ure (4 sid [amd64]) Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice (4 sid [amd64])' 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + ure +The following packages will be upgraded: + libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy +4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libreoffice [3] (4 sid [amd64]) [] +Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-common [3] (4 sid [all]) [] +Inst ure (4 sid [amd64]) +Conf ure (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) +Conf libreoffice-common (4 sid [all]) +Conf libreoffice-core (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s |