summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <juliank@ubuntu.com>2018-04-09 15:32:09 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2019-01-18 16:32:45 +0100
commit03af77d4ca60a21f3dca1ab10ef2ba17ec2f96c9 (patch)
tree7867cfa7a2ead40aeb5f9020d0e0f1b8c56719b1
parente4ad2101c39020f18ccd8bb522eeb6b5dead0e5d (diff)
Import Debian version 1.0.1ubuntu2.18
apt (1.0.1ubuntu2.18) trusty; urgency=medium * ExecFork: Use /proc/self/fd to determine which files to close (Closes: #764204) (LP: #1332440). apt (1.0.1ubuntu2.17) trusty-security; urgency=high * SECURITY UPDATE: gpgv: Check for errors when splitting files (CVE-2016-1252) Thanks to Jann Horn, Google Project Zero for reporting the issue (LP: #1647467) apt (1.0.1ubuntu2.15) trusty; urgency=medium * Fixes failure to download the Package index file when using mirror:// URL in sources.list and the archive fails to profile a file. APT would try the next archive in the list for .deb packages but did not retry when the index file failed to download. (LP: #1625667) apt (1.0.1ubuntu2.14) trusty; urgency=medium * When using the https transport mechanism, $no_proxy is ignored if apt is getting it's proxy information from $https_proxy (as opposed to Acquire::https::Proxy somewhere in apt config). If the source of proxy information is Acquire::https::Proxy set in apt.conf (or apt.conf.d), then $no_proxy is honored. This patch makes the behavior similar for both methods of setting the proxy. (LP: #1575877) apt (1.0.1ubuntu2.13) trusty; urgency=medium * Recheck Pre-Depends satisfaction in SmartConfigure, to avoid unconfigured Pre-Depends (which dpkg later fails on). Fixes upgrade failures of systemd, util-linux, and other packages with Pre-Depends. Many thanks to David Kalnischkies for figuring out the patch and Winfried PLappert for testing! Patch taken from Debian git. (LP: #1560797) apt (1.0.1ubuntu2.12) trusty; urgency=medium [ Colin Watson ] * Fix lzma write support to handle "try again" case (closes: #751688, LP: #1553770). [ David Kalnischkies ] * Handle moved mmap after UniqFindTagWrite call (closes: #753941, LP: #1445436). apt (1.0.1ubuntu2.11) trusty; urgency=medium * apt-pkg/packagemanager.cc: - fix incorrect configure ordering in the SmartConfigure step by skipping packages that do not need immediate action. (LP: #1347721, #1497688) apt (1.0.1ubuntu2.10) trusty; urgency=medium * Fix regression from the previous upload by ensuring we're actually testing for the right member before iterating on it (LP: #1480592) apt (1.0.1ubuntu2.9) trusty; urgency=medium * Fix regression in the Never-MarkAuto-Sections feature caused by the previous auto-removal fix, with inspiration drawn from the patches and conversation from http://bugs.debian.org/793360 (LP: #1479207) apt (1.0.1ubuntu2.8) trusty-proposed; urgency=low * fix crash for packages that have no section in their instVersion (LP: #1449394) apt (1.0.1ubuntu2.7) trusty-proposed; urgency=low * fix auto-removal behavior (thanks to Adam Conrad) LP: #1429041 apt (1.0.1ubuntu2.6) trusty-proposed; urgency=medium * apt-pkg/deb/dpkgpm.cc: - update string matching for dpkg I/O errors. (LP: #1363257) - properly parse the dpkg status line so that package name is properly set and an apport report is created. Thanks to Anders Kaseorg for the patch. (LP: #1353171) apt (1.0.1ubuntu2.5) trusty-security; urgency=low * SECURITY UPDATE: - cmdline/apt-get.cc: fix insecure tempfile handling in apt-get changelog (CVE-2014-7206). Thanks to Guillem Jover apt (1.0.1ubuntu2.4.1) trusty-security; urgency=low * SECURITY UPDATE: - fix potential buffer overflow, thanks to the Google Security Team (CVE-2014-6273) * Fix regression from the previous upload when file:/// sources are used and those are on a different partition than the apt state directory * Fix regression when Dir::state::lists is set to a relative path * Fix regression when cdrom: sources got rewriten by apt-cdrom add apt (1.0.1ubuntu2.3) trusty-security; urgency=low * SECURITY UPDATE: - incorrect invalidating of unauthenticated data (CVE-2014-0488) - incorect verification of 304 reply (CVE-2014-0487) - incorrect verification of Acquire::Gzip indexes (CVE-2014-0489)
-rw-r--r--.travis.yml2
-rw-r--r--apt-pkg/acquire-item.cc111
-rw-r--r--apt-pkg/acquire-item.h8
-rw-r--r--apt-pkg/contrib/fileutl.cc43
-rw-r--r--apt-pkg/contrib/gpgv.cc23
-rw-r--r--apt-pkg/contrib/hashes.cc2
-rw-r--r--apt-pkg/contrib/hashes.h2
-rw-r--r--apt-pkg/deb/deblistparser.cc8
-rw-r--r--apt-pkg/deb/dpkgpm.cc24
-rw-r--r--apt-pkg/depcache.cc3
-rw-r--r--apt-pkg/packagemanager.cc51
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog140
-rw-r--r--debian/copyright23
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/tests/control2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot6
-rw-r--r--doc/po/de.po13
-rw-r--r--doc/po/es.po4
-rw-r--r--doc/po/fr.po4
-rw-r--r--doc/po/it.po4
-rw-r--r--doc/po/ja.po4
-rw-r--r--doc/po/pl.po4
-rw-r--r--doc/po/pt.po4
-rw-r--r--doc/po/pt_BR.po4
-rw-r--r--ftparchive/apt-ftparchive.cc52
-rw-r--r--ftparchive/cachedb.cc363
-rw-r--r--ftparchive/cachedb.h63
-rw-r--r--ftparchive/makefile2
-rw-r--r--ftparchive/sources.cc47
-rw-r--r--ftparchive/sources.h32
-rw-r--r--ftparchive/writer.cc107
-rw-r--r--ftparchive/writer.h2
-rw-r--r--methods/copy.cc38
-rw-r--r--methods/http.cc24
-rw-r--r--methods/https.cc12
-rw-r--r--po/apt-all.pot180
-rw-r--r--po/ar.po182
-rw-r--r--po/ast.po179
-rw-r--r--po/bg.po179
-rw-r--r--po/bs.po182
-rw-r--r--po/ca.po179
-rw-r--r--po/cs.po179
-rw-r--r--po/cy.po179
-rw-r--r--po/da.po179
-rw-r--r--po/de.po179
-rw-r--r--po/dz.po179
-rw-r--r--po/el.po179
-rw-r--r--po/es.po179
-rw-r--r--po/eu.po179
-rw-r--r--po/fi.po179
-rw-r--r--po/fr.po179
-rw-r--r--po/gl.po179
-rw-r--r--po/hu.po179
-rw-r--r--po/it.po179
-rw-r--r--po/ja.po179
-rw-r--r--po/km.po179
-rw-r--r--po/ko.po179
-rw-r--r--po/ku.po182
-rw-r--r--po/lt.po179
-rw-r--r--po/mr.po179
-rw-r--r--po/nb.po179
-rw-r--r--po/ne.po179
-rw-r--r--po/nl.po179
-rw-r--r--po/nn.po179
-rw-r--r--po/pl.po179
-rw-r--r--po/pt.po179
-rw-r--r--po/pt_BR.po179
-rw-r--r--po/ro.po179
-rw-r--r--po/ru.po179
-rw-r--r--po/sk.po179
-rw-r--r--po/sl.po179
-rw-r--r--po/sv.po179
-rw-r--r--po/th.po179
-rw-r--r--po/tl.po179
-rw-r--r--po/tr.po179
-rw-r--r--po/uk.po179
-rw-r--r--po/vi.po179
-rw-r--r--po/zh_CN.po179
-rw-r--r--po/zh_TW.po179
-rw-r--r--test/integration/cachedb-lp1274466-old-format.dbbin8192 -> 0 bytes
-rw-r--r--test/integration/deb-lp1274466-cachedb.debbin1270 -> 0 bytes
-rw-r--r--test/integration/framework8
-rwxr-xr-xtest/integration/test-apt-ftparchive-cachedb100
-rwxr-xr-xtest/integration/test-apt-ftparchive-cachedb-lp127446650
-rwxr-xr-xtest/integration/test-apt-ftparchive-src-cachedb193
-rwxr-xr-xtest/integration/test-apt-http-overflow35
-rwxr-xr-xtest/integration/test-apt-update-file36
-rwxr-xr-xtest/integration/test-apt-update-stale46
-rwxr-xr-xtest/integration/test-apt-update-unauth48
-rwxr-xr-xtest/integration/test-bug-747261-arch-specific-conflicts51
-rwxr-xr-xtest/integration/test-bug-762160-relpath17
-rwxr-xr-xtest/integration/test-failing-maintainer-scripts2
-rwxr-xr-xtest/integration/test-hashsum-verification14
96 files changed, 4678 insertions, 5047 deletions
diff --git a/.travis.yml b/.travis.yml
index 872ff47db..2d9194c28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: cpp
before_install:
- sudo apt-get update -q
- - sudo apt-get install -q --no-install-recommends dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml stunnel4 db-util
+ - sudo apt-get install -q --no-install-recommends dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml stunnel4
script: make && make test && test/integration/run-tests
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 30743addf..4ddab943c 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -999,7 +999,7 @@ string pkgAcqIndex::Custom600Headers()
string msg = "\nIndex-File: true";
// FIXME: this really should use "IndexTarget::IsOptional()" but that
// seems to be difficult without breaking ABI
- if (ShortDesc().find("Translation") != 0)
+ if (ShortDesc().find("Translation") != std::string::npos)
msg += "\nFail-Ignore: true";
struct stat Buf;
if (stat(Final.c_str(),&Buf) == 0)
@@ -1028,6 +1028,31 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
Item::Failed(Message,Cnf);
}
/*}}}*/
+// pkgAcqIndex::GetFinalFilename - Return the full final file path /*{{{*/
+std::string pkgAcqIndex::GetFinalFilename(std::string const &URI,
+ std::string const &compExt)
+{
+ std::string FinalFile = _config->FindDir("Dir::State::lists");
+ FinalFile += URItoFileName(URI);
+ if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
+ FinalFile += ".gz";
+ return FinalFile;
+}
+ /*}}}*/
+// AcqIndex::ReverifyAfterIMS - Reverify index after an ims-hit /*{{{*/
+void pkgAcqIndex::ReverifyAfterIMS(std::string const &FileName)
+{
+ std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
+ if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
+ DestFile += ".gz";
+
+ string FinalFile = GetFinalFilename(RealURI, compExt);
+ Rename(FinalFile, FileName);
+ Decompression = true;
+ Desc.URI = "copy:" + FileName;
+ QueueURI(Desc);
+}
+ /*}}}*/
// AcqIndex::Done - Finished a fetch /*{{{*/
// ---------------------------------------------------------------------
/* This goes through a number of states.. On the initial fetch the
@@ -1039,6 +1064,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
pkgAcquire::MethodConfig *Cfg)
{
Item::Done(Message,Size,Hash,Cfg);
+ std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
if (Decompression == true)
{
@@ -1050,6 +1076,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
if (!ExpectedHash.empty() && ExpectedHash.toStr() != Hash)
{
+ Desc.URI = RealURI;
RenameOnError(HashSumMismatch);
return;
}
@@ -1058,9 +1085,9 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
* have a Package field) (LP: #346386) (Closes: #627642) */
if (Verify == true)
{
- FileFd fd(DestFile, FileFd::ReadOnly);
+ FileFd fd(DestFile, FileFd::ReadOnlyGzip);
// Only test for correctness if the file is not empty (empty is ok)
- if (fd.FileSize() > 0)
+ if (fd.Size() > 0)
{
pkgTagSection sec;
pkgTagFile tag(&fd);
@@ -1075,8 +1102,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
}
// Done, move it into position
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
+ string FinalFile = GetFinalFilename(RealURI, compExt);
Rename(DestFile,FinalFile);
chmod(FinalFile.c_str(),0644);
@@ -1084,7 +1110,9 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
will work OK */
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(RealURI);
-
+ if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
+ DestFile += ".gz";
+
// Remove the compressed version.
if (Erase == true)
unlink(DestFile.c_str());
@@ -1098,9 +1126,6 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
string FileName = LookupTag(Message,"Alt-Filename");
if (FileName.empty() == false)
{
- // The files timestamp matches
- if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
- return;
Decompression = true;
Local = true;
DestFile += ".decomp";
@@ -1117,33 +1142,36 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
ErrorText = "Method gave a blank filename";
}
- std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
-
- // The files timestamp matches
- if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) {
- if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
- // Update DestFile for .gz suffix so that the clean operation keeps it
- DestFile += ".gz";
- return;
- }
-
if (FileName == DestFile)
Erase = true;
else
Local = true;
-
+
+ // do not reverify cdrom sources as apt-cdrom may rewrite the Packages
+ // file when its doing the indexcopy
+ if (RealURI.substr(0,6) == "cdrom:" &&
+ StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
+ return;
+
+ // The files timestamp matches
+ if (!Local && StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
+ {
+ ReverifyAfterIMS(FileName);
+ return;
+ }
+
string decompProg;
- // If we enable compressed indexes and already have gzip, keep it
- if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) {
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI) + ".gz";
- Rename(DestFile,FinalFile);
- chmod(FinalFile.c_str(),0644);
-
- // Update DestFile for .gz suffix so that the clean operation keeps it
- DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+ // If we enable compressed indexes, queue for hash verification
+ if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local)
+ {
+ DestFile = _config->FindDir("Dir::State::lists");
DestFile += URItoFileName(RealURI) + ".gz";
+
+ Decompression = true;
+ Desc.URI = "copy:" + FileName;
+ QueueURI(Desc);
+
return;
}
@@ -1187,6 +1215,9 @@ string pkgAcqIndexTrans::Custom600Headers()
string Final = _config->FindDir("Dir::State::lists");
Final += URItoFileName(RealURI);
+ if (_config->FindB("Acquire::GzipIndexes",false))
+ Final += ".gz";
+
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
return "\nFail-Ignore: true\nIndex-File: true";
@@ -1516,6 +1547,28 @@ void pkgAcqMetaIndex::AuthDone(string Message) /*{{{*/
std::cerr << "Signature verification succeeded: "
<< DestFile << std::endl;
+ // do not trust any previously unverified content that we may have
+ string LastGoodSigFile = _config->FindDir("Dir::State::lists").append("partial/").append(URItoFileName(RealURI));
+ if (DestFile != SigFile)
+ LastGoodSigFile.append(".gpg");
+ LastGoodSigFile.append(".reverify");
+ if(IMSHit == false && RealFileExists(LastGoodSigFile) == false)
+ {
+ for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin();
+ Target != IndexTargets->end();
+ ++Target)
+ {
+ // remove old indexes
+ std::string index = _config->FindDir("Dir::State::lists") +
+ URItoFileName((*Target)->URI);
+ unlink(index.c_str());
+ // and also old gzipindexes
+ index += ".gz";
+ unlink(index.c_str());
+ }
+ }
+
+
// Download further indexes with verification
QueueIndexes(true);
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f48d2a0d7..54e3b92b3 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -713,6 +713,14 @@ class pkgAcqIndex : public pkgAcquire::Item
*/
std::string CompressionExtension;
+ /** \brief Get the full pathname of the final file for the given URI
+ */
+ std::string GetFinalFilename(std::string const &URI,
+ std::string const &compExt);
+
+ /** \brief Schedule file for verification after a IMS hit */
+ void ReverifyAfterIMS(std::string const &FileName);
+
public:
// Specialized action members
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 69a675648..3d4276f34 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -781,11 +781,26 @@ pid_t ExecFork(std::set<int> KeepFDs)
signal(SIGCONT,SIG_DFL);
signal(SIGTSTP,SIG_DFL);
- // Close all of our FDs - just in case
- for (int K = 3; K != sysconf(_SC_OPEN_MAX); K++)
+ DIR *dir = opendir("/proc/self/fd");
+ if (dir != NULL)
{
- if(KeepFDs.find(K) == KeepFDs.end())
- fcntl(K,F_SETFD,FD_CLOEXEC);
+ struct dirent *ent;
+ while ((ent = readdir(dir)))
+ {
+ int fd = atoi(ent->d_name);
+ // If fd > 0, it was a fd number and not . or ..
+ if (fd >= 3 && KeepFDs.find(fd) == KeepFDs.end())
+ fcntl(fd,F_SETFD,FD_CLOEXEC);
+ }
+ closedir(dir);
+ } else {
+ long ScOpenMax = sysconf(_SC_OPEN_MAX);
+ // Close all of our FDs - just in case
+ for (int K = 3; K != ScOpenMax; K++)
+ {
+ if(KeepFDs.find(K) == KeepFDs.end())
+ fcntl(K,F_SETFD,FD_CLOEXEC);
+ }
}
}
@@ -1574,18 +1589,34 @@ bool FileFd::Write(const void *From,unsigned long long Size)
size_t const n = sizeof(d->lzma->buffer)/sizeof(d->lzma->buffer[0]) - d->lzma->stream.avail_out;
size_t const m = (n == 0) ? 0 : fwrite(d->lzma->buffer, 1, n, d->lzma->file);
if (m != n)
+ {
Res = -1;
+ errno = 0;
+ }
else
+ {
Res = Size - d->lzma->stream.avail_in;
+ if (Res == 0)
+ {
+ // lzma run was okay, but produced no output…
+ Res = -1;
+ errno = EINTR;
+ }
+ }
}
#endif
else
Res = write(iFd,From,Size);
- if (Res < 0 && errno == EINTR)
- continue;
if (Res < 0)
{
+ if (errno == EINTR)
+ {
+ // trick the while-loop into running again
+ Res = 1;
+ errno = 0;
+ continue;
+ }
if (false)
/* dummy so that the rest can be 'else if's */;
#ifdef HAVE_ZLIB
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index f24dd9640..0d74050cb 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -247,6 +247,20 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
}
/*}}}*/
// SplitClearSignedFile - split message into data/signature /*{{{*/
+static int GetLineErrno(char **lineptr, size_t *n, FILE *stream, std::string const &InFile)
+{
+ int result;
+
+ errno = 0;
+ result = getline(lineptr, n, stream);
+ if (errno != 0)
+ {
+ _error->Errno("getline", "Could not read from %s", InFile.c_str());
+ return -1;
+ }
+
+ return result;
+}
bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile)
{
@@ -262,7 +276,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
char *buf = NULL;
size_t buf_size = 0;
- while (getline(&buf, &buf_size, in) != -1)
+ _error->PushToStack();
+ while (GetLineErrno(&buf, &buf_size, in, InFile) != -1)
{
_strrstrip(buf);
if (found_message_start == false)
@@ -324,6 +339,12 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
}
fclose(in);
+ // An error occured during reading - propagate it up
+ bool const hasErrored = _error->PendingError();
+ _error->MergeWithStack();
+ if (hasErrored)
+ return false;
+
if (found_signature == true)
return _error->Error("Signature in file %s wasn't closed", InFile.c_str());
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 15f83615d..1fce0d75f 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -133,7 +133,7 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5,
bool const addSHA1, bool const addSHA256, bool const addSHA512)
{
unsigned char Buf[64*64];
- bool const ToEOF = (Size == UntilEOF);
+ bool const ToEOF = (Size == 0);
while (Size != 0 || ToEOF)
{
unsigned long long n = sizeof(Buf);
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 7a62f8a8f..5cd1af03b 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -78,8 +78,6 @@ class Hashes
SHA256Summation SHA256;
SHA512Summation SHA512;
- static const int UntilEOF = 0;
-
inline bool Add(const unsigned char *Data,unsigned long long Size)
{
return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index a1bcfb710..02b9cb239 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -145,7 +145,8 @@ unsigned char debListParser::ParseMultiArch(bool const showErrors) /*{{{*/
bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
{
// Parse the section
- Ver->Section = UniqFindTagWrite("Section");
+ unsigned long const idxSection = UniqFindTagWrite("Section");
+ Ver->Section = idxSection;
Ver->MultiArch = ParseMultiArch(true);
// Archive Size
Ver->Size = Section.FindULL("Size");
@@ -260,7 +261,10 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
pkgCache::VerIterator &Ver)
{
if (Pkg->Section == 0)
- Pkg->Section = UniqFindTagWrite("Section");
+ {
+ unsigned long const idxSection = UniqFindTagWrite("Section");
+ Pkg->Section = idxSection;
+ }
string const static myArch = _config->Find("APT::Architecture");
// Possible values are: "all", "native", "installed" and "none"
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e410594df..43c5214d4 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -621,15 +621,15 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
{
if(action == "error")
{
- d->progress->Error(list[1], PackagesDone, PackagesTotal,
+ d->progress->Error(pkgname, PackagesDone, PackagesTotal,
list[3]);
pkgFailures++;
- WriteApportReport(list[1].c_str(), list[3].c_str());
+ WriteApportReport(pkgname.c_str(), list[3].c_str());
return;
}
else if(action == "conffile-prompt")
{
- d->progress->ConffilePrompt(list[1], PackagesDone, PackagesTotal,
+ d->progress->ConffilePrompt(pkgname, PackagesDone, PackagesTotal,
list[3]);
return;
}
@@ -1053,15 +1053,14 @@ void pkgDPkgPM::StartPtyMagic()
}
// setup the pty and stuff
- struct winsize win;
+ struct winsize win;
- // if tcgetattr for both stdin/stdout returns 0 (no error)
- // we do the pty magic
+ // if tcgetattr does not return zero there was a error
+ // and we do not do any pty magic
_error->PushToStack();
- if (tcgetattr(STDIN_FILENO, &d->tt) == 0 &&
- tcgetattr(STDOUT_FILENO, &d->tt) == 0)
+ if (tcgetattr(STDOUT_FILENO, &d->tt) == 0)
{
- if (ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) < 0)
+ if (ioctl(1, TIOCGWINSZ, (char *)&win) < 0)
{
_error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed"));
} else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0)
@@ -1667,9 +1666,10 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
// do not report dpkg I/O errors, this is a format string, so we compare
// the prefix and the suffix of the error with the dpkg error message
vector<string> io_errors;
- io_errors.push_back(string("failed to read on buffer copy for %s"));
- io_errors.push_back(string("failed in write on buffer copy for %s"));
- io_errors.push_back(string("short read on buffer copy for %s"));
+ io_errors.push_back(string("failed to read"));
+ io_errors.push_back(string("failed to write"));
+ io_errors.push_back(string("failed to seek"));
+ io_errors.push_back(string("unexpected end of file or stream"));
for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); ++I)
{
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 19a6e0d7e..30b1f8543 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1225,7 +1225,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
continue;
}
// now check if we should consider it a automatic dependency or not
- if(InstPkg->CurrentVer == 0 && Pkg->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section()))
+ if(InstPkg->CurrentVer == 0 && P.InstVerIter(*this)->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", P.InstVerIter(*this).Section()))
+
{
if(DebugAutoInstall == true)
std::clog << OutputInDepth(Depth) << "Setting NOT as auto-installed (direct "
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 5d6bc6bd2..58ce73d5c 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -349,6 +349,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
std::list<DepIterator> needConfigure;
do
{
+ // Check each dependency and see if anything needs to be done
+ // so that it can be configured
Changed = false;
for (DepIterator D = instVer.DependsList(); D.end() == false; )
{
@@ -356,11 +358,12 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
pkgCache::DepIterator Start, End;
D.GlobOr(Start,End);
- if (End->Type != pkgCache::Dep::Depends)
+ if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)
continue;
Bad = true;
- // Check for dependencies that have not been unpacked, probably due to loops.
+ // the first pass checks if we its all good, i.e. if we have
+ // to do anything at all
for (DepIterator Cur = Start; true; ++Cur)
{
SPtrArray<Version *> VList = Cur.AllTargets();
@@ -390,6 +393,47 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
Bad = false;
break;
}
+ }
+
+ if (Cur == End || Bad == false)
+ break;
+ }
+
+ // this dependency is in a good state, so we can stop
+ if (Bad == false)
+ {
+ if (Debug)
+ std::clog << OutputInDepth(Depth) << "Found ok dep " << D.TargetPkg() << std::endl;
+ continue;
+ }
+
+ // Check for dependencies that have not been unpacked,
+ // probably due to loops.
+ for (DepIterator Cur = Start; true; ++Cur)
+ {
+ SPtrArray<Version *> VList = Cur.AllTargets();
+
+ for (Version **I = VList; *I != 0; ++I)
+ {
+ VerIterator Ver(Cache,*I);
+ PkgIterator DepPkg = Ver.ParentPkg();
+
+ // Check if the current version of the package is available and will satisfy this dependency
+ if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+ List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
+ DepPkg.State() == PkgIterator::NeedsNothing)
+ continue;
+
+ // Check if the version that is going to be installed will satisfy the dependency
+ if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
+ continue;
+
+ if (PkgLoop == true)
+ {
+ if (Debug)
+ std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
+ Bad = false;
+ }
else
{
if (Debug)
@@ -422,6 +466,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str());
} while (Changed == true);
+ // now go over anything that needs configuring
Bad = false, Changed = false, i = 0;
do
{
@@ -435,7 +480,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
Discard.GlobOr(Start,End);
}
- if (End->Type != pkgCache::Dep::Depends)
+ if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)
continue;
Bad = true;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 7a77ace74..efb9c36a4 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1564,7 +1564,7 @@ static bool DoChangelog(CommandLine &CmdL)
{
string changelogfile;
if (downOnly == false)
- changelogfile.append(tmpname).append("changelog");
+ changelogfile.append(tmpname).append("/changelog");
else
changelogfile.append(Ver.ParentPkg().Name()).append(".changelog");
if (DownloadChangelog(Cache, Fetcher, Ver, changelogfile) && downOnly == false)
diff --git a/configure.ac b/configure.ac
index 344cd50c1..a7ac52ea1 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="1.0.1ubuntu2.2"
+PACKAGE_VERSION="1.0.1ubuntu2"
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 bf6cc1c76..900eef806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,137 @@
-apt (1.0.1ubuntu2.2) trusty-proposed; urgency=medium
+apt (1.0.1ubuntu2.18) trusty; urgency=medium
- * Implement CacheDB for source packages in apt-ftparchive
- LP: #1329212
- * Only do openpty() if both stdin/stdout are terminals (Closes: 746434)
- LP: #1324399
- * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466)
- * fix tests and add db-util to the test dependencies
+ * ExecFork: Use /proc/self/fd to determine which files to close
+ (Closes: #764204) (LP: #1332440).
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 18 Jun 2014 11:09:52 +0200
+ -- Julian Andres Klode <juliank@ubuntu.com> Mon, 09 Apr 2018 15:32:09 +0200
+
+apt (1.0.1ubuntu2.17) trusty-security; urgency=high
+
+ * SECURITY UPDATE: gpgv: Check for errors when splitting files (CVE-2016-1252)
+ Thanks to Jann Horn, Google Project Zero for reporting the issue
+ (LP: #1647467)
+
+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 08 Dec 2016 15:31:29 +0100
+
+apt (1.0.1ubuntu2.15) trusty; urgency=medium
+
+ * Fixes failure to download the Package index file when using
+ mirror:// URL in sources.list and the archive fails to profile
+ a file. APT would try the next archive in the list for .deb
+ packages but did not retry when the index file failed to download.
+ (LP: #1625667)
+
+ -- Louis Bouchard <louis.bouchard@ubuntu.com> Tue, 20 Sep 2016 17:02:03 +0200
+
+apt (1.0.1ubuntu2.14) trusty; urgency=medium
+
+ * When using the https transport mechanism, $no_proxy is ignored if apt is
+ getting it's proxy information from $https_proxy (as opposed to
+ Acquire::https::Proxy somewhere in apt config). If the source of proxy
+ information is Acquire::https::Proxy set in apt.conf (or apt.conf.d),
+ then $no_proxy is honored. This patch makes the behavior similar for
+ both methods of setting the proxy. (LP: #1575877)
+
+ -- Patrick Cable <pc@pcable.net> Tue, 17 May 2016 13:45:06 -0700
+
+apt (1.0.1ubuntu2.13) trusty; urgency=medium
+
+ * Recheck Pre-Depends satisfaction in SmartConfigure, to avoid unconfigured
+ Pre-Depends (which dpkg later fails on). Fixes upgrade failures of
+ systemd, util-linux, and other packages with Pre-Depends. Many thanks to
+ David Kalnischkies for figuring out the patch and Winfried PLappert for
+ testing! Patch taken from Debian git. (LP: #1560797)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 19 Apr 2016 12:32:43 +0200
+
+apt (1.0.1ubuntu2.12) trusty; urgency=medium
+
+ [ Colin Watson ]
+ * Fix lzma write support to handle "try again" case (closes: #751688,
+ LP: #1553770).
+
+ [ David Kalnischkies ]
+ * Handle moved mmap after UniqFindTagWrite call (closes: #753941,
+ LP: #1445436).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 06 Mar 2016 19:01:04 +0000
+
+apt (1.0.1ubuntu2.11) trusty; urgency=medium
+
+ * apt-pkg/packagemanager.cc:
+ - fix incorrect configure ordering in the SmartConfigure step by skipping
+ packages that do not need immediate action. (LP: #1347721, #1497688)
+
+ -- Brian Murray <brian@ubuntu.com> Fri, 08 Jan 2016 16:09:22 -0800
+
+apt (1.0.1ubuntu2.10) trusty; urgency=medium
+
+ * Fix regression from the previous upload by ensuring we're actually
+ testing for the right member before iterating on it (LP: #1480592)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Sat, 01 Aug 2015 04:52:49 -0600
+
+apt (1.0.1ubuntu2.9) trusty; urgency=medium
+
+ * Fix regression in the Never-MarkAuto-Sections feature caused by the
+ previous auto-removal fix, with inspiration drawn from the patches
+ and conversation from http://bugs.debian.org/793360 (LP: #1479207)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 29 Jul 2015 21:23:49 -0600
+
+apt (1.0.1ubuntu2.8) trusty-proposed; urgency=low
+
+ * fix crash for packages that have no section in their instVersion
+ (LP: #1449394)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Apr 2015 09:00:52 +0200
+
+apt (1.0.1ubuntu2.7) trusty-proposed; urgency=low
+
+ * fix auto-removal behavior (thanks to Adam Conrad)
+ LP: #1429041
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Mar 2015 14:55:31 +0100
+
+apt (1.0.1ubuntu2.6) trusty-proposed; urgency=medium
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - update string matching for dpkg I/O errors. (LP: #1363257)
+ - properly parse the dpkg status line so that package name is properly set
+ and an apport report is created. Thanks to Anders Kaseorg for the patch.
+ (LP: #1353171)
+
+ -- Brian Murray <brian@ubuntu.com> Wed, 08 Oct 2014 14:01:41 -0700
+
+apt (1.0.1ubuntu2.5) trusty-security; urgency=low
+
+ * SECURITY UPDATE:
+ - cmdline/apt-get.cc: fix insecure tempfile handling in
+ apt-get changelog (CVE-2014-7206). Thanks to Guillem Jover
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Oct 2014 10:38:50 +0200
+
+apt (1.0.1ubuntu2.4.1) trusty-security; urgency=low
+
+ * SECURITY UPDATE:
+ - fix potential buffer overflow, thanks to the
+ Google Security Team (CVE-2014-6273)
+ * Fix regression from the previous upload when file:/// sources
+ are used and those are on a different partition than
+ the apt state directory
+ * Fix regression when Dir::state::lists is set to a relative path
+ * Fix regression when cdrom: sources got rewriten by apt-cdrom add
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Sep 2014 09:04:44 +0200
+
+apt (1.0.1ubuntu2.3) trusty-security; urgency=low
+
+ * SECURITY UPDATE:
+ - incorrect invalidating of unauthenticated data (CVE-2014-0488)
+ - incorect verification of 304 reply (CVE-2014-0487)
+ - incorrect verification of Acquire::Gzip indexes (CVE-2014-0489)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Sep 2014 08:23:35 +0200
apt (1.0.1ubuntu2.1) trusty-security; urgency=low
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..c0e89b51a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,23 @@
+Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+Apt is currently developed by APT Development Team <deity@lists.debian.org>.
+
+License: GPLv2+
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
+
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 089405f49..0b205c1fd 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
[DEFAULT]
prebuild = ./prepare-release pre-export
postbuild = ./prepare-release post-build
-debian-branch = ubuntu/trusty
+debian-branch = ubuntu/master
debian-tag = %(version)s
diff --git a/debian/tests/control b/debian/tests/control
index 72e9deef7..209f16bfd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: run-tests
Restrictions: allow-stderr
-Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev, db-util
+Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index e63a4dd6e..93f814f50 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.1ubuntu2.2">
+<!ENTITY apt-product-version "1.0.1ubuntu2">
<!-- (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 ed7a8b6bf..233ffd25b 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 1.0.1ubuntu2\n"
+"Project-Id-Version: apt-doc 1.0.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6242,7 +6242,7 @@ msgstr ""
#: guide.sgml:163
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 "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 864f31972..953eeed37 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.16\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8829,18 +8829,9 @@ 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 name=\"apt-get\" section=\"8\">. 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 "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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/es.po b/doc/po/es.po
index 2f7895d8c..219e56710 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -8897,7 +8897,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 section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 9ab55ee66..cabedea51 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -8857,7 +8857,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 section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 78a172d6e..afef7d860 100644
--- a/doc/po/it.po
+++ b/doc/po/it.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -8810,7 +8810,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 section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 dc96cc7b1..36564102f 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 14:00+0200\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -8440,7 +8440,7 @@ msgstr ""
#: guide.sgml:163
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 "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 a1fb4404a..d70676ff7 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 13:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -8097,7 +8097,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 section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 7b3f0a529..d0433d498 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2014-04-01 13:59+0200\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -8806,7 +8806,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 section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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 a0873f747..15d0bf27d 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -6647,7 +6647,7 @@ msgstr ""
#: guide.sgml:163
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 "
+"its man page, <manref name=\"apt-get\" section=\"8\">. 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/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index ba71ee225..692f19e25 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -62,7 +62,6 @@ struct PackageMap
// Stuff for the Package File
string PkgFile;
string BinCacheDB;
- string SrcCacheDB;
string BinOverride;
string ExtraOverride;
@@ -107,12 +106,6 @@ struct PackageMap
inline bool operator() (const PackageMap &x,const PackageMap &y)
{return x.BinCacheDB < y.BinCacheDB;};
};
-
- struct SrcDBCompare : public binary_function<PackageMap,PackageMap,bool>
- {
- inline bool operator() (const PackageMap &x,const PackageMap &y)
- {return x.SrcCacheDB < y.SrcCacheDB;};
- };
void GetGeneral(Configuration &Setup,Configuration &Block);
bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats);
@@ -239,14 +232,11 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
gettimeofday(&NewTime,0);
double Delta = NewTime.tv_sec - StartTime.tv_sec +
(NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
-
+
c0out << Packages.Stats.Packages << " files " <<
/* SizeToStr(Packages.Stats.MD5Bytes) << "B/" << */
SizeToStr(Packages.Stats.Bytes) << "B " <<
TimeToStr((long)Delta) << endl;
-
- if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
- c0out << " Misses in Cache: " << Packages.Stats.Misses<< endl;
Stats.Add(Packages.Stats);
Stats.DeLinkBytes = Packages.Stats.DeLinkBytes;
@@ -273,7 +263,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
SrcDone = true;
// Create a package writer object.
- SourcesWriter Sources(flCombine(CacheDir, SrcCacheDB),
+ SourcesWriter Sources(_config->Find("APT::FTPArchive::DB"),
flCombine(OverrideDir,BinOverride),
flCombine(OverrideDir,SrcOverride),
flCombine(OverrideDir,SrcExtraOverride));
@@ -333,9 +323,6 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
c0out << Sources.Stats.Packages << " pkgs in " <<
TimeToStr((long)Delta) << endl;
- if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
- c0out << " Misses in Cache: " << Sources.Stats.Misses << endl;
-
Stats.Add(Sources.Stats);
Stats.DeLinkBytes = Sources.Stats.DeLinkBytes;
@@ -448,9 +435,6 @@ bool PackageMap::GenContents(Configuration &Setup,
double Delta = NewTime.tv_sec - StartTime.tv_sec +
(NewTime.tv_usec - StartTime.tv_usec)/1000000.0;
- if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
- c0out << " Misses in Cache: " << Contents.Stats.Misses<< endl;
-
c0out << Contents.Stats.Packages << " files " <<
SizeToStr(Contents.Stats.Bytes) << "B " <<
TimeToStr((long)Delta) << endl;
@@ -481,8 +465,6 @@ static void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
string DContentsH = Setup.Find("TreeDefault::Contents::Header","");
string DBCache = Setup.Find("TreeDefault::BinCacheDB",
"packages-$(ARCH).db");
- string SrcDBCache = Setup.Find("TreeDefault::SrcCacheDB",
- "sources-$(SECTION).db");
string DSources = Setup.Find("TreeDefault::Sources",
"$(DIST)/$(SECTION)/source/Sources");
string DFLFile = Setup.Find("TreeDefault::FileList", "");
@@ -542,7 +524,6 @@ static void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
Itm.Tag = SubstVar("$(DIST)/$(SECTION)/source",Vars);
Itm.FLFile = SubstVar(Block.Find("SourceFileList",DSFLFile.c_str()),Vars);
Itm.SrcExtraOverride = SubstVar(Block.Find("SrcExtraOverride"),Vars);
- Itm.SrcCacheDB = SubstVar(Block.Find("SrcCacheDB",SrcDBCache.c_str()),Vars);
}
else
{
@@ -592,7 +573,6 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
Itm.PkgFile = Block.Find("Packages");
Itm.SrcFile = Block.Find("Sources");
Itm.BinCacheDB = Block.Find("BinCacheDB");
- Itm.SrcCacheDB = Block.Find("SrcCacheDB");
Itm.BinOverride = Block.Find("BinOverride");
Itm.ExtraOverride = Block.Find("ExtraOverride");
Itm.SrcExtraOverride = Block.Find("SrcExtraOverride");
@@ -690,10 +670,6 @@ static bool SimpleGenPackages(CommandLine &CmdL)
if (Packages.RecursiveScan(CmdL.FileList[1]) == false)
return false;
- // Give some stats if asked for
- if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
- c0out << " Misses in Cache: " << Packages.Stats.Misses<< endl;
-
return true;
}
/*}}}*/
@@ -750,10 +726,6 @@ static bool SimpleGenSources(CommandLine &CmdL)
if (Sources.RecursiveScan(CmdL.FileList[1]) == false)
return false;
- // Give some stats if asked for
- if(_config->FindB("APT::FTPArchive::ShowCacheMisses", false) == true)
- c0out << " Misses in Cache: " << Sources.Stats.Misses<< endl;
-
return true;
}
/*}}}*/
@@ -805,7 +777,6 @@ static bool Generate(CommandLine &CmdL)
// Sort by cache DB to improve IO locality.
stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare());
// Generate packages
if (CmdL.FileSize() <= 2)
@@ -965,33 +936,20 @@ static bool Clean(CommandLine &CmdL)
// Sort by cache DB to improve IO locality.
stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare());
- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare());
string CacheDir = Setup.FindDir("Dir::CacheDir");
for (vector<PackageMap>::iterator I = PkgList.begin(); I != PkgList.end(); )
{
- if(I->BinCacheDB != "")
- c0out << I->BinCacheDB << endl;
- if(I->SrcCacheDB != "")
- c0out << I->SrcCacheDB << endl;
+ c0out << I->BinCacheDB << endl;
CacheDB DB(flCombine(CacheDir,I->BinCacheDB));
- CacheDB DB_SRC(flCombine(CacheDir,I->SrcCacheDB));
if (DB.Clean() == false)
_error->DumpErrors();
- if (DB_SRC.Clean() == false)
- _error->DumpErrors();
string CacheDB = I->BinCacheDB;
- string SrcCacheDB = I->SrcCacheDB;
- while(I != PkgList.end() &&
- I->BinCacheDB == CacheDB &&
- I->SrcCacheDB == SrcCacheDB)
- ++I;
-
+ for (; I != PkgList.end() && I->BinCacheDB == CacheDB; ++I);
}
-
-
+
return true;
}
/*}}}*/
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index c3a4adcbc..523c6b5fa 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -20,7 +20,6 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/debfile.h>
-#include <apt-pkg/gpgv.h>
#include <netinet/in.h> // htonl, etc
#include <ctype.h>
@@ -86,7 +85,7 @@ bool CacheDB::ReadyDB(std::string const &DB)
return _error->Error(_("Unable to open DB file %s: %s"),DB.c_str(), db_strerror(err));
}
}
-
+
DBFile = DB;
DBLoaded = true;
return true;
@@ -97,54 +96,14 @@ bool CacheDB::ReadyDB(std::string const &DB)
/* */
bool CacheDB::OpenFile()
{
- // always close existing file first
- CloseFile();
-
- // open a new file
- Fd = new FileFd(FileName,FileFd::ReadOnly);
- if (_error->PendingError() == true)
- {
- CloseFile();
- return false;
- }
- return true;
-}
- /*}}}*/
-// CacheDB::CloseFile - Close the file /*{{{*/
-void CacheDB::CloseFile()
-{
- if(Fd != NULL)
- {
- delete Fd;
- Fd = NULL;
- }
-}
- /*}}}*/
-// CacheDB::OpenDebFile - Open a debfile /*{{{*/
-bool CacheDB::OpenDebFile()
-{
- // always close existing file first
- CloseDebFile();
-
- // first open the fd, then pass it to the debDebFile
- if(OpenFile() == false)
- return false;
- DebFile = new debDebFile(*Fd);
- if (_error->PendingError() == true)
- return false;
- return true;
-}
- /*}}}*/
-// CacheDB::CloseDebFile - Close a debfile again /*{{{*/
-void CacheDB::CloseDebFile()
-{
- CloseFile();
-
- if(DebFile != NULL)
- {
- delete DebFile;
- DebFile = NULL;
- }
+ Fd = new FileFd(FileName,FileFd::ReadOnly);
+ if (_error->PendingError() == true)
+ {
+ delete Fd;
+ Fd = NULL;
+ return false;
+ }
+ return true;
}
/*}}}*/
// CacheDB::GetFileStat - Get stats from the file /*{{{*/
@@ -153,65 +112,29 @@ void CacheDB::CloseDebFile()
* to look at the file, also get the mtime from the file. */
bool CacheDB::GetFileStat(bool const &doStat)
{
- if ((CurStat.Flags & FlSize) == FlSize && doStat == false)
- return true;
-
- /* Get it from the file. */
- if (OpenFile() == false)
- return false;
-
- // Stat the file
- struct stat St;
- if (fstat(Fd->Fd(),&St) != 0)
- {
- CloseFile();
- return _error->Errno("fstat",
- _("Failed to stat %s"),FileName.c_str());
- }
- CurStat.FileSize = St.st_size;
- CurStat.mtime = htonl(St.st_mtime);
- CurStat.Flags |= FlSize;
-
- return true;
-}
- /*}}}*/
-// CacheDB::GetCurStatCompatOldFormat /*{{{*/
-// ---------------------------------------------------------------------
-/* Read the old (32bit FileSize) StateStore format from disk */
-bool CacheDB::GetCurStatCompatOldFormat()
-{
- InitQueryStats();
- Data.data = &CurStatOldFormat;
- Data.flags = DB_DBT_USERMEM;
- Data.ulen = sizeof(CurStatOldFormat);
- if (Get() == false)
- {
- CurStat.Flags = 0;
- } else {
- CurStat.Flags = CurStatOldFormat.Flags;
- CurStat.mtime = CurStatOldFormat.mtime;
- CurStat.FileSize = CurStatOldFormat.FileSize;
- memcpy(CurStat.MD5, CurStatOldFormat.MD5, sizeof(CurStat.MD5));
- memcpy(CurStat.SHA1, CurStatOldFormat.SHA1, sizeof(CurStat.SHA1));
- memcpy(CurStat.SHA256, CurStatOldFormat.SHA256, sizeof(CurStat.SHA256));
- }
- return true;
-}
- /*}}}*/
-// CacheDB::GetCurStatCompatOldFormat /*{{{*/
-// ---------------------------------------------------------------------
-/* Read the new (64bit FileSize) StateStore format from disk */
-bool CacheDB::GetCurStatCompatNewFormat()
-{
- InitQueryStats();
- Data.data = &CurStat;
- Data.flags = DB_DBT_USERMEM;
- Data.ulen = sizeof(CurStat);
- if (Get() == false)
- {
- CurStat.Flags = 0;
- }
- return true;
+ if ((CurStat.Flags & FlSize) == FlSize && doStat == false)
+ {
+ /* Already worked out the file size */
+ }
+ else
+ {
+ /* Get it from the file. */
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
+ // Stat the file
+ struct stat St;
+ if (fstat(Fd->Fd(),&St) != 0)
+ {
+ return _error->Errno("fstat",
+ _("Failed to stat %s"),FileName.c_str());
+ }
+ CurStat.FileSize = St.st_size;
+ CurStat.mtime = htonl(St.st_mtime);
+ CurStat.Flags |= FlSize;
+ }
+ return true;
}
/*}}}*/
// CacheDB::GetCurStat - Set the CurStat variable. /*{{{*/
@@ -222,110 +145,79 @@ bool CacheDB::GetCurStat()
{
memset(&CurStat,0,sizeof(CurStat));
- if (DBLoaded)
- {
- // do a first query to just get the size of the data on disk
- InitQueryStats();
- Data.data = &CurStat;
- Data.flags = DB_DBT_USERMEM;
- Data.ulen = 0;
- Get();
-
- if (Data.size == 0)
- {
- // nothing needs to be done, we just have not data for this deb
- }
- // check if the record is written in the old format (32bit filesize)
- else if(Data.size == sizeof(CurStatOldFormat))
- {
- GetCurStatCompatOldFormat();
- }
- else if(Data.size == sizeof(CurStat))
+ if (DBLoaded)
+ {
+ /* First see if there is anything about it
+ in the database */
+
+ /* Get the flags (and mtime) */
+ InitQuery("st");
+ // Ensure alignment of the returned structure
+ Data.data = &CurStat;
+ Data.ulen = sizeof(CurStat);
+ Data.flags = DB_DBT_USERMEM;
+ if (Get() == false)
{
- GetCurStatCompatNewFormat();
- } else {
- return _error->Error("Cache record size mismatch (%ul)", Data.size);
- }
-
- CurStat.Flags = ntohl(CurStat.Flags);
- CurStat.FileSize = ntohl(CurStat.FileSize);
+ CurStat.Flags = 0;
+ }
+ CurStat.Flags = ntohl(CurStat.Flags);
+ CurStat.FileSize = ntohl(CurStat.FileSize);
}
- return true;
+ return true;
}
/*}}}*/
// CacheDB::GetFileInfo - Get all the info about the file /*{{{*/
// ---------------------------------------------------------------------
-bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl,
- bool const &DoContents,
- bool const &GenContentsOnly,
- bool const &DoSource,
- bool const &DoMD5, bool const &DoSHA1,
- bool const &DoSHA256, bool const &DoSHA512,
+bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents,
+ bool const &GenContentsOnly, bool const &DoMD5, bool const &DoSHA1,
+ bool const &DoSHA256, bool const &DoSHA512,
bool const &checkMtime)
{
- bool result = true;
- this->FileName = FileName;
-
- if (GetCurStat() == false)
- return false;
- OldStat = CurStat;
-
- if (GetFileStat(checkMtime) == false)
- return false;
-
- /* if mtime changed, update CurStat from disk */
- if (checkMtime == true && OldStat.mtime != CurStat.mtime)
- CurStat.Flags = FlSize;
-
- Stats.Bytes += CurStat.FileSize;
- Stats.Packages++;
-
- if ((DoControl && LoadControl() == false)
- || (DoContents && LoadContents(GenContentsOnly) == false)
- || (DoSource && LoadSource() == false)
- || (DoMD5 && GetMD5(false) == false)
- || (DoSHA1 && GetSHA1(false) == false)
- || (DoSHA256 && GetSHA256(false) == false)
- || (DoSHA512 && GetSHA512(false) == false) )
- {
- result = false;
- }
-
- return result;
-}
- /*}}}*/
+ this->FileName = FileName;
-bool CacheDB::LoadSource()
-{
- // Try to read the control information out of the DB.
- if ((CurStat.Flags & FlSource) == FlSource)
+ if (GetCurStat() == false)
{
- // Lookup the control information
- InitQuerySource();
- if (Get() == true && Dsc.TakeDsc(Data.data, Data.size) == true)
- {
- return true;
- }
- CurStat.Flags &= ~FlSource;
- }
- if (OpenFile() == false)
- return false;
+ return false;
+ }
+ OldStat = CurStat;
- Stats.Misses++;
- if (Dsc.Read(FileName) == false)
- return false;
-
- if (Dsc.Data == 0)
- return _error->Error(_("Failed to read .dsc"));
-
- // Write back the control information
- InitQuerySource();
- if (Put(Dsc.Data, Dsc.Length) == true)
- CurStat.Flags |= FlSource;
+ if (GetFileStat(checkMtime) == false)
+ {
+ delete Fd;
+ Fd = NULL;
+ return false;
+ }
+
+ /* if mtime changed, update CurStat from disk */
+ if (checkMtime == true && OldStat.mtime != CurStat.mtime)
+ CurStat.Flags = FlSize;
+
+ Stats.Bytes += CurStat.FileSize;
+ Stats.Packages++;
+
+ if ((DoControl && LoadControl() == false)
+ || (DoContents && LoadContents(GenContentsOnly) == false)
+ || (DoMD5 && GetMD5(false) == false)
+ || (DoSHA1 && GetSHA1(false) == false)
+ || (DoSHA256 && GetSHA256(false) == false)
+ || (DoSHA512 && GetSHA512(false) == false)
+ )
+ {
+ delete Fd;
+ Fd = NULL;
+ delete DebFile;
+ DebFile = NULL;
+ return false;
+ }
+
+ delete Fd;
+ Fd = NULL;
+ delete DebFile;
+ DebFile = NULL;
return true;
}
-
+ /*}}}*/
// CacheDB::LoadControl - Load Control information /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -335,14 +227,23 @@ bool CacheDB::LoadControl()
if ((CurStat.Flags & FlControl) == FlControl)
{
// Lookup the control information
- InitQueryControl();
+ InitQuery("cl");
if (Get() == true && Control.TakeControl(Data.data,Data.size) == true)
return true;
CurStat.Flags &= ~FlControl;
}
- if(OpenDebFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
+ }
+ // Create a deb instance to read the archive
+ if (DebFile == 0)
+ {
+ DebFile = new debDebFile(*Fd);
+ if (_error->PendingError() == true)
+ return false;
+ }
Stats.Misses++;
if (Control.Read(*DebFile) == false)
@@ -352,7 +253,7 @@ bool CacheDB::LoadControl()
return _error->Error(_("Archive has no control record"));
// Write back the control information
- InitQueryControl();
+ InitQuery("cl");
if (Put(Control.Control,Control.Length) == true)
CurStat.Flags |= FlControl;
return true;
@@ -370,7 +271,7 @@ bool CacheDB::LoadContents(bool const &GenOnly)
return true;
// Lookup the contents information
- InitQueryContent();
+ InitQuery("cn");
if (Get() == true)
{
if (Contents.TakeContents(Data.data,Data.size) == true)
@@ -380,15 +281,23 @@ bool CacheDB::LoadContents(bool const &GenOnly)
CurStat.Flags &= ~FlContents;
}
- if(OpenDebFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
+ }
+ // Create a deb instance to read the archive
+ if (DebFile == 0)
+ {
+ DebFile = new debDebFile(*Fd);
+ if (_error->PendingError() == true)
+ return false;
+ }
- Stats.Misses++;
if (Contents.Read(*DebFile) == false)
return false;
// Write back the control information
- InitQueryContent();
+ InitQuery("cn");
if (Put(Contents.Data,Contents.CurSize) == true)
CurStat.Flags |= FlContents;
return true;
@@ -438,13 +347,14 @@ bool CacheDB::GetMD5(bool const &GenOnly)
MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5));
return true;
- }
+ }
Stats.MD5Bytes += CurStat.FileSize;
- if (OpenFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
-
+ }
MD5Summation MD5;
if (Fd->Seek(0) == false || MD5.AddFD(*Fd, CurStat.FileSize) == false)
return false;
@@ -472,9 +382,10 @@ bool CacheDB::GetSHA1(bool const &GenOnly)
Stats.SHA1Bytes += CurStat.FileSize;
- if (OpenFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
-
+ }
SHA1Summation SHA1;
if (Fd->Seek(0) == false || SHA1.AddFD(*Fd, CurStat.FileSize) == false)
return false;
@@ -502,9 +413,10 @@ bool CacheDB::GetSHA256(bool const &GenOnly)
Stats.SHA256Bytes += CurStat.FileSize;
- if (OpenFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
-
+ }
SHA256Summation SHA256;
if (Fd->Seek(0) == false || SHA256.AddFD(*Fd, CurStat.FileSize) == false)
return false;
@@ -532,9 +444,10 @@ bool CacheDB::GetSHA512(bool const &GenOnly)
Stats.SHA512Bytes += CurStat.FileSize;
- if (OpenFile() == false)
+ if (Fd == NULL && OpenFile() == false)
+ {
return false;
-
+ }
SHA512Summation SHA512;
if (Fd->Seek(0) == false || SHA512.AddFD(*Fd, CurStat.FileSize) == false)
return false;
@@ -554,11 +467,11 @@ bool CacheDB::Finish()
if (CurStat.Flags == OldStat.Flags &&
CurStat.mtime == OldStat.mtime)
return true;
-
+
// Write the stat information
CurStat.Flags = htonl(CurStat.Flags);
CurStat.FileSize = htonl(CurStat.FileSize);
- InitQueryStats();
+ InitQuery("st");
Put(&CurStat,sizeof(CurStat));
CurStat.Flags = ntohl(CurStat.Flags);
CurStat.FileSize = ntohl(CurStat.FileSize);
@@ -591,24 +504,16 @@ bool CacheDB::Clean()
{
if (stringcmp(Colon + 1, (char *)Key.data+Key.size,"st") == 0 ||
stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 ||
- stringcmp(Colon + 1, (char *)Key.data+Key.size,"cs") == 0 ||
stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0)
{
- std::string FileName = std::string((const char *)Key.data,Colon);
- if (FileExists(FileName) == true) {
- continue;
- }
+ if (FileExists(std::string((const char *)Key.data,Colon)) == true)
+ continue;
}
}
+
Cursor->c_del(Cursor,0);
}
- int res = Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
- if (res < 0)
- _error->Warning("compact failed with result %i", res);
-
- if(_config->FindB("Debug::APT::FTPArchive::Clean", false) == true)
- Dbp->stat_print(Dbp, 0);
-
+ Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
return true;
}
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 169a46b2c..49b9a0ef5 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -22,11 +22,9 @@
#include <stdio.h>
#include "contents.h"
-#include "sources.h"
class FileFd;
-
class CacheDB
{
protected:
@@ -41,7 +39,7 @@ class CacheDB
std::string DBFile;
// Generate a key for the DB of a given type
- void _InitQuery(const char *Type)
+ inline void InitQuery(const char *Type)
{
memset(&Key,0,sizeof(Key));
memset(&Data,0,sizeof(Data));
@@ -49,19 +47,6 @@ class CacheDB
Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
}
- void InitQueryStats() {
- _InitQuery("st");
- }
- void InitQuerySource() {
- _InitQuery("cs");
- }
- void InitQueryControl() {
- _InitQuery("cl");
- }
- void InitQueryContent() {
- _InitQuery("cn");
- }
-
inline bool Get()
{
return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
@@ -80,20 +65,10 @@ class CacheDB
return true;
}
bool OpenFile();
- void CloseFile();
-
- bool OpenDebFile();
- void CloseDebFile();
-
- // GetCurStat needs some compat code, see lp #1274466)
- bool GetCurStatCompatOldFormat();
- bool GetCurStatCompatNewFormat();
- bool GetCurStat();
-
bool GetFileStat(bool const &doStat = false);
+ bool GetCurStat();
bool LoadControl();
bool LoadContents(bool const &GenOnly);
- bool LoadSource();
bool GetMD5(bool const &GenOnly);
bool GetSHA1(bool const &GenOnly);
bool GetSHA256(bool const &GenOnly);
@@ -102,23 +77,8 @@ class CacheDB
// Stat info stored in the DB, Fixed types since it is written to disk.
enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5),
- FlSHA512=(1<<6), FlSource=(1<<7),
- };
-
- // the on-disk format changed (FileSize increased to 64bit) in
- // commit 650faab0 which will lead to corruption with old caches
- struct StatStoreOldFormat
- {
- uint32_t Flags;
- uint32_t mtime;
- uint32_t FileSize;
- uint8_t MD5[16];
- uint8_t SHA1[20];
- uint8_t SHA256[32];
- } CurStatOldFormat;
+ FlSHA512=(1<<6)};
- // WARNING: this struct is read/written to the DB so do not change the
- // layout of the fields (see lp #1274466), only append to it
struct StatStore
{
uint32_t Flags;
@@ -141,8 +101,6 @@ class CacheDB
// Data collection helpers
debDebFile::MemControlExtract Control;
ContentsExtract Contents;
- DscExtract Dsc;
-
std::string MD5Res;
std::string SHA1Res;
std::string SHA256Res;
@@ -181,19 +139,8 @@ class CacheDB
inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
-
- // terrible old overloaded interface
- bool GetFileInfo(std::string const &FileName,
- bool const &DoControl,
- bool const &DoContents,
- bool const &GenContentsOnly,
- bool const &DoSource,
- bool const &DoMD5,
- bool const &DoSHA1,
- bool const &DoSHA256,
- bool const &DoSHA512,
- bool const &checkMtime = false);
-
+ bool GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
+ bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
bool Finish();
bool Clean();
diff --git a/ftparchive/makefile b/ftparchive/makefile
index d1ffe182a..c53ecff72 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -12,7 +12,7 @@ PROGRAM=apt-ftparchive
SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
- multicompress.cc sources.cc
+ multicompress.cc
include $(PROGRAM_H)
else
PROGRAM=apt-ftparchive
diff --git a/ftparchive/sources.cc b/ftparchive/sources.cc
deleted file mode 100644
index d0878a70a..000000000
--- a/ftparchive/sources.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <string>
-#include <iostream>
-
-// for memcpy
-#include <cstring>
-
-#include <apt-pkg/error.h>
-#include <apt-pkg/gpgv.h>
-
-#include "sources.h"
-
-bool DscExtract::TakeDsc(const void *newData, unsigned long newSize)
-{
- if(newSize > maxSize)
- return _error->Error("DSC data is too large %lu!", newSize);
-
- if (newSize == 0)
- {
- Length = 0;
- return true;
- }
- memcpy(Data, newData, newSize);
- Length = newSize;
-
- return true;
-}
-
-bool DscExtract::Read(std::string FileName)
-{
- FileFd F;
- if (OpenMaybeClearSignedFile(FileName, F) == false)
- return false;
-
- unsigned long long const FSize = F.FileSize();
- if(FSize > maxSize)
- return _error->Error("DSC file '%s' is too large!",FileName.c_str());
-
- if (F.Read(Data, FSize) == false)
- return false;
- Length = FSize;
-
- IsClearSigned = (FileName != F.Name());
-
- return true;
-}
-
-
diff --git a/ftparchive/sources.h b/ftparchive/sources.h
deleted file mode 100644
index 91e0b1376..000000000
--- a/ftparchive/sources.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef SOURCES_H
-#define SOURCES_H
-
-#include <apt-pkg/tagfile.h>
-
-class DscExtract
-{
- public:
- //FIXME: do we really need to enforce a maximum size of the dsc file?
- static const int maxSize = 128*1024;
-
- char *Data;
- pkgTagSection Section;
- unsigned long Length;
- bool IsClearSigned;
-
- bool TakeDsc(const void *Data, unsigned long Size);
- bool Read(std::string FileName);
-
- DscExtract() : Data(0), Length(0) {
- Data = new char[maxSize];
- };
- ~DscExtract() {
- if(Data != NULL) {
- delete [] Data;
- Data = NULL;
- }
- };
-};
-
-
-#endif
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 7c1c9cc03..153c4fb42 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -385,14 +385,10 @@ bool FTWScanner::SetExts(string const &Vals)
bool PackagesWriter::DoPackage(string FileName)
{
// Pull all the data we need form the DB
- if (Db.GetFileInfo(FileName,
- true, /* DoControl */
- DoContents,
- true, /* GenContentsOnly */
- false, /* DoSource */
- DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat) == false)
+ if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat)
+ == false)
{
- return false;
+ return false;
}
unsigned long long FileSize = Db.GetFileSize();
@@ -618,36 +614,59 @@ SourcesWriter::SourcesWriter(string const &DB, string const &BOverrides,string c
/* */
bool SourcesWriter::DoPackage(string FileName)
{
- // Pull all the data we need form the DB
- if (Db.GetFileInfo(FileName,
- false, /* DoControl */
- false, /* DoContents */
- false, /* GenContentsOnly */
- true, /* DoSource */
- DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat) == false)
- {
+ // Open the archive
+ FileFd F;
+ if (OpenMaybeClearSignedFile(FileName, F) == false)
return false;
+
+ unsigned long long const FSize = F.FileSize();
+ //FIXME: do we really need to enforce a maximum size of the dsc file?
+ if (FSize > 128*1024)
+ return _error->Error("DSC file '%s' is too large!",FileName.c_str());
+
+ if (BufSize < FSize + 2)
+ {
+ BufSize = FSize + 2;
+ Buffer = (char *)realloc(Buffer , BufSize);
}
- // we need to perform a "write" here (this is what finish is doing)
- // because the call to Db.GetFileInfo() in the loop will change
- // the "db cursor"
- Db.Finish();
+ if (F.Read(Buffer, FSize) == false)
+ return false;
- // read stuff
- char *Start = Db.Dsc.Data;
- char *BlkEnd = Db.Dsc.Data + Db.Dsc.Length;
+ // Stat the file for later (F might be clearsigned, so not F.FileSize())
+ struct stat St;
+ if (stat(FileName.c_str(), &St) != 0)
+ return _error->Errno("fstat","Failed to stat %s",FileName.c_str());
+
+ // Hash the file
+ char *Start = Buffer;
+ char *BlkEnd = Buffer + FSize;
+
+ Hashes DscHashes;
+ if (FSize == (unsigned long long) St.st_size)
+ {
+ if (DoMD5 == true)
+ DscHashes.MD5.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA1 == true)
+ DscHashes.SHA1.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA256 == true)
+ DscHashes.SHA256.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA512 == true)
+ DscHashes.SHA512.Add((unsigned char *)Start,BlkEnd - Start);
+ }
+ else
+ {
+ FileFd DscFile(FileName, FileFd::ReadOnly);
+ DscHashes.AddFD(DscFile, St.st_size, DoMD5, DoSHA1, DoSHA256, DoSHA512);
+ }
// Add extra \n to the end, just in case (as in clearsigned they are missing)
*BlkEnd++ = '\n';
*BlkEnd++ = '\n';
pkgTagSection Tags;
- if (Tags.Scan(Start,BlkEnd - Start) == false)
+ if (Tags.Scan(Start,BlkEnd - Start) == false || Tags.Exists("Source") == false)
return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str());
-
- if (Tags.Exists("Source") == false)
- return _error->Error("Could not find a Source entry in the DSC '%s'",FileName.c_str());
Tags.Trim();
// Lookup the overide information, finding first the best priority.
@@ -695,10 +714,6 @@ bool SourcesWriter::DoPackage(string FileName)
OverItem = auto_ptr<Override::Item>(new Override::Item);
}
- struct stat St;
- if (stat(FileName.c_str(), &St) != 0)
- return _error->Errno("fstat","Failed to stat %s",FileName.c_str());
-
auto_ptr<Override::Item> SOverItem(SOver.GetItem(Tags.FindS("Source")));
// const auto_ptr<Override::Item> autoSOverItem(SOverItem);
if (SOverItem.get() == 0)
@@ -717,23 +732,23 @@ bool SourcesWriter::DoPackage(string FileName)
string const strippedName = flNotDir(FileName);
std::ostringstream ostreamFiles;
if (DoMD5 == true && Tags.Exists("Files"))
- ostreamFiles << "\n " << Db.MD5Res.c_str() << " " << St.st_size << " "
+ ostreamFiles << "\n " << string(DscHashes.MD5.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Files");
string const Files = ostreamFiles.str();
std::ostringstream ostreamSha1;
if (DoSHA1 == true && Tags.Exists("Checksums-Sha1"))
- ostreamSha1 << "\n " << string(Db.SHA1Res.c_str()) << " " << St.st_size << " "
+ ostreamSha1 << "\n " << string(DscHashes.SHA1.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha1");
std::ostringstream ostreamSha256;
if (DoSHA256 == true && Tags.Exists("Checksums-Sha256"))
- ostreamSha256 << "\n " << string(Db.SHA256Res.c_str()) << " " << St.st_size << " "
+ ostreamSha256 << "\n " << string(DscHashes.SHA256.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha256");
std::ostringstream ostreamSha512;
if (DoSHA512 == true && Tags.Exists("Checksums-Sha512"))
- ostreamSha512 << "\n " << string(Db.SHA512Res.c_str()) << " " << St.st_size << " "
+ ostreamSha512 << "\n " << string(DscHashes.SHA512.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha512");
// Strip the DirStrip prefix from the FileName and add the PathPrefix
@@ -770,13 +785,8 @@ bool SourcesWriter::DoPackage(string FileName)
(DoSHA256 == true && !Tags.Exists("Checksums-Sha256")) ||
(DoSHA512 == true && !Tags.Exists("Checksums-Sha512")))
{
- if (Db.GetFileInfo(OriginalPath,
- false, /* DoControl */
- false, /* DoContents */
- false, /* GenContentsOnly */
- false, /* DoSource */
- DoMD5, DoSHA1, DoSHA256, DoSHA512,
- DoAlwaysStat) == false)
+ if (Db.GetFileInfo(OriginalPath, false, false, false, DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat)
+ == false)
{
return _error->Error("Error getting file info");
}
@@ -792,9 +802,6 @@ bool SourcesWriter::DoPackage(string FileName)
if (DoSHA512 == true && !Tags.Exists("Checksums-Sha512"))
ostreamSha512 << "\n " << string(Db.SHA512Res) << " "
<< Db.GetFileSize() << " " << ParseJnk;
-
- // write back the GetFileInfo() stats data
- Db.Finish();
}
// Perform the delinking operation
@@ -865,7 +872,7 @@ bool SourcesWriter::DoPackage(string FileName)
Stats.Packages++;
- return true;
+ return Db.Finish();
}
/*}}}*/
@@ -886,15 +893,7 @@ ContentsWriter::ContentsWriter(string const &DB, string const &Arch) :
determine what the package name is. */
bool ContentsWriter::DoPackage(string FileName, string Package)
{
- if (!Db.GetFileInfo(FileName,
- Package.empty(), /* DoControl */
- true, /* DoContents */
- false, /* GenContentsOnly */
- false, /* DoSource */
- false, /* DoMD5 */
- false, /* DoSHA1 */
- false, /* DoSHA256 */
- false)) /* DoSHA512 */
+ if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false, false))
{
return false;
}
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index b1a653e7d..86884dcfc 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -174,7 +174,7 @@ class SourcesWriter : public FTWScanner
string PathPrefix;
string DirStrip;
FILE *Output;
- struct CacheDB::Stats &Stats;
+ struct CacheDB::Stats Stats;
virtual bool DoPackage(string FileName);
diff --git a/methods/copy.cc b/methods/copy.cc
index d59f032ff..cc0ee6554 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -16,6 +16,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
#include <string>
#include <sys/stat.h>
@@ -27,19 +28,35 @@
class CopyMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
-
+ void CalculateHashes(FetchResult &Res);
+
public:
- CopyMethod() : pkgAcqMethod("1.0",SingleInstance) {};
+ CopyMethod() : pkgAcqMethod("1.0",SingleInstance|SendConfig) {};
};
+void CopyMethod::CalculateHashes(FetchResult &Res)
+{
+ // For gzip indexes we need to look inside the gzip for the hash
+ // We can not use the extension here as its not used in partial
+ // on a IMS hit
+ FileFd::OpenMode OpenMode = FileFd::ReadOnly;
+ if (_config->FindB("Acquire::GzipIndexes", false) == true)
+ OpenMode = FileFd::ReadOnlyGzip;
+
+ Hashes Hash;
+ FileFd Fd(Res.Filename, OpenMode);
+ Hash.AddFD(Fd);
+ Res.TakeHashes(Hash);
+}
+
// CopyMethod::Fetch - Fetch a file /*{{{*/
// ---------------------------------------------------------------------
/* */
bool CopyMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
- std::string File = Get.Path;
+ std::string File = Get.Host + Get.Path; // To account for relative paths
// Stat the file and send a start message
struct stat Buf;
@@ -53,7 +70,15 @@ bool CopyMethod::Fetch(FetchItem *Itm)
Res.LastModified = Buf.st_mtime;
Res.IMSHit = false;
URIStart(Res);
-
+
+ // when the files are identical, just compute the hashes
+ if(File == Itm->DestFile)
+ {
+ CalculateHashes(Res);
+ URIDone(Res);
+ return true;
+ }
+
// See if the file exists
FileFd From(File,FileFd::ReadOnly);
FileFd To(Itm->DestFile,FileFd::WriteAtomic);
@@ -82,10 +107,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
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);
- Hash.AddFD(Fd);
- Res.TakeHashes(Hash);
+ CalculateHashes(Res);
URIDone(Res);
return true;
diff --git a/methods/http.cc b/methods/http.cc
index ed6e3517d..d3a5d718f 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -667,7 +667,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
URI Uri = Itm->Uri;
// The HTTP server expects a hostname with a trailing :port
- char Buf[1000];
+ string Buf;
string ProperHost;
if (Uri.Host.find(':') != string::npos)
@@ -676,14 +676,10 @@ void HttpMethod::SendReq(FetchItem *Itm)
ProperHost = Uri.Host;
if (Uri.Port != 0)
{
- sprintf(Buf,":%u",Uri.Port);
+ strprintf(Buf,":%u",Uri.Port);
ProperHost += Buf;
}
- // Just in case.
- if (Itm->Uri.length() >= sizeof(Buf))
- abort();
-
/* RFC 2616 §5.1.2 requires absolute URIs for requests to proxies,
but while its a must for all servers to accept absolute URIs,
it is assumed clients will sent an absolute path for non-proxies */
@@ -701,25 +697,27 @@ void HttpMethod::SendReq(FetchItem *Itm)
in 1.1, can cause problems with proxies, and we are an HTTP/1.1
client anyway.
C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */
- sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
+ strprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
requesturi.c_str(),ProperHost.c_str());
// generate a cache control header (if needed)
if (_config->FindB("Acquire::http::No-Cache",false) == true)
{
- strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
+ Buf += "Cache-Control: no-cache\r\nPragma: no-cache\r\n";
}
else
{
if (Itm->IndexFile == true)
{
- sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
+ string Tmp;
+ strprintf(Tmp,"Cache-Control: max-age=%u\r\n",
_config->FindI("Acquire::http::Max-Age",0));
+ Buf += Tmp;
}
else
{
if (_config->FindB("Acquire::http::No-Store",false) == true)
- strcat(Buf,"Cache-Control: no-store\r\n");
+ Buf += "Cache-Control: no-store\r\n";
}
}
@@ -733,7 +731,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
size_t const filepos = Itm->Uri.find_last_of('/');
string const file = Itm->Uri.substr(filepos + 1);
if (flExtension(file) == file)
- strcat(Buf,"Accept: text/*\r\n");
+ Buf += "Accept: text/*\r\n";
}
string Req = Buf;
@@ -743,7 +741,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
{
// In this case we send an if-range query with a range header
- sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size,
+ strprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size,
TimeRFC1123(SBuf.st_mtime).c_str());
Req += Buf;
}
@@ -751,7 +749,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
{
if (Itm->LastModified != 0)
{
- sprintf(Buf,"If-Modified-Since: %s\r\n",TimeRFC1123(Itm->LastModified).c_str());
+ strprintf(Buf,"If-Modified-Since: %s\r\n",TimeRFC1123(Itm->LastModified).c_str());
Req += Buf;
}
}
diff --git a/methods/https.cc b/methods/https.cc
index c4aff8f38..087604b6d 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -124,13 +124,13 @@ void HttpsMethod::SetupProxy() /*{{{*/
if (UseProxy == "DIRECT")
return;
- if (UseProxy.empty() == false)
+ // Parse no_proxy, a comma (,) separated list of domains we don't want to use
+ // a proxy for so we stop right here if it is in the list
+ if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+ return;
+
+ if (UseProxy.empty() == true)
{
- // Parse no_proxy, a comma (,) separated list of domains we don't want to use
- // a proxy for so we stop right here if it is in the list
- if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
- return;
- } else {
const char* result = getenv("https_proxy");
// FIXME: Fall back to http_proxy is to remain compatible with
// existing setups and behaviour of apt.conf. This should be
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 1db8b3ebb..1be1aed29 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.0.1ubuntu2\n"
+"Project-Id-Version: apt 1.0.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -154,9 +154,9 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -244,77 +244,77 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -322,151 +322,151 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -560,7 +560,7 @@ msgstr ""
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
msgid "You don't have enough free space in %s."
msgstr ""
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr ""
@@ -1196,23 +1196,23 @@ msgstr ""
msgid "Recommended packages:"
msgstr ""
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -1606,31 +1606,31 @@ msgstr ""
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1672,51 +1672,47 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr ""
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr ""
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr ""
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:319
-msgid "Failed to read .dsc"
-msgstr ""
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr ""
@@ -1781,26 +1777,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3169,61 +3165,61 @@ msgstr ""
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, c-format
msgid "Can not write log (%s)"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 6e7000706..71d258035 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -161,9 +161,9 @@ msgid " Version table:"
msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -252,77 +252,77 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -330,151 +330,151 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -569,7 +569,7 @@ msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1058,7 +1058,7 @@ msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
msgid "You don't have enough free space in %s."
msgstr "ليس هناك مساحة كافية في %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
@@ -1217,23 +1217,23 @@ msgstr "الحزم المقترحة:"
msgid "Recommended packages:"
msgstr "الحزم المستحسنة:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "تم غض النظر عن تحذير المصادقة.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "تعذرت المصادقة على بعض الحزم"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "تثبيت هذه الحزم دون التحقق منها؟"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
@@ -1638,31 +1638,31 @@ msgstr "تعذرت الكتابة إلى %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "قائمة توسيعات الحزمة طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "خطأ في معالجة الدليل %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "قائمة توسيعات المصدر طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "خطأ في معالجة المحتويات %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1704,52 +1704,47 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "لم تُطابق أية تحديدات"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "تعذرت إزالة %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr ""
@@ -1814,26 +1809,26 @@ msgstr "*** فشل ربط %s بـ%s"
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3210,61 +3205,61 @@ msgstr "التحضير لإزالة %s بالكامل"
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "تعذرت الكتابة إلى %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3357,6 +3352,9 @@ msgstr ""
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "فتح ملف التهيئة %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "تعذرت إزالة %s"
+
#~ msgid "Failed to change to the admin dir %sinfo"
#~ msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
diff --git a/po/ast.po b/po/ast.po
index 7f03d1300..dd85b439e 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -154,9 +154,9 @@ msgid " Version table:"
msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -295,70 +295,70 @@ msgstr ""
" -c=? Llee esti ficheru de configuración\n"
" -o=? Conseña una opción de configuración arbitraria, p. ex.\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nun pudo alcontrase'l paquete %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s axustáu como instaláu automáticamente.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Error internu, l'iguador de problemes frañó coses"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -379,97 +379,97 @@ msgstr ""
"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
"paquete.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orde build '%s'.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Falló el procesu fíu"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construcción.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,7 +478,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -487,14 +487,14 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +503,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,30 +512,30 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -675,7 +675,7 @@ msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -1168,7 +1168,7 @@ msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
msgid "You don't have enough free space in %s."
msgstr "Nun tienes espaciu libre bastante en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Hai problemes y utilizose -y ensin --force-yes"
@@ -1340,23 +1340,23 @@ msgstr "Paquetes afalaos:"
msgid "Recommended packages:"
msgstr "Paquetes encamentaos"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Avisu d'autenticación saltáu.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Dellos paquetes nun pudieron autenticase"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "¿Instalar esos paquetes ensin verificación?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
@@ -1780,31 +1780,31 @@ msgstr "Nun se pue escribir en %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "La llista d'estensión de paquetes ye enforma llarga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Error al procesar el direutoriu %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "La llista d'estensión de fontes ye enforma llarga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Error al escribir la cabecera al ficheru de conteníos"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Error al procesar conteníos %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1885,26 +1885,26 @@ msgstr ""
" -c=? Lleer esti ficheru de configuración\n"
" -o=? Afita una escoyeta de configuración propia"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nun concasó denguna seleición"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "La BD corrompiose, ficheru renomáu como %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "La DB ye antigua, tentando actualizar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1912,27 +1912,22 @@ msgstr ""
"El formatu de la base de datos nun ye válidu. Si anovaste dende una versión "
"anterior d'apt, desanicia y recrea la base de datos."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Nun pudo lleese %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nun pudo lleese l'enllaz %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "L'archivu nun tien rexistru de control"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
@@ -1997,26 +1992,26 @@ msgstr "*** Falló enllazar enllazr %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -3457,37 +3452,37 @@ msgstr "Preparándose pa desinstalar dafechu %s"
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nun se pue escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3495,7 +3490,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3503,7 +3498,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3511,7 +3506,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"memoria"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3520,7 +3515,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"discu llenu"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 9fd608161..906c831a7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -297,47 +297,47 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Използване на пакет източник „%s“ вместо „%s“\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелязан като ръчно инсталиран.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s е отбелязан като автоматично инсталиран.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -345,24 +345,24 @@ msgstr ""
"Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark "
"manual“."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -384,80 +384,80 @@ msgstr ""
"за да изтеглите последните промени в пакета (евентуално в процес на "
"разработка).\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,18 +466,18 @@ msgstr ""
"Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
"Architectures в apt.conf(5)."
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Журнал на промените в %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -682,7 +682,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -1202,7 +1202,7 @@ msgstr "След тази операция ще бъде освободено %s
msgid "You don't have enough free space in %s."
msgstr "Нямате достатъчно свободно пространство в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
@@ -1373,23 +1373,23 @@ msgstr "Предложени пакети:"
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Някои пакети не можаха да бъдат удостоверени"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Инсталиране на тези пакети без проверка?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -1812,31 +1812,31 @@ msgstr "Неуспех при записа на %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Списъкът с разширения на пакети и твърде дълъг"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Грешка при обработката на директория %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Списъкът с разширения на източници е твърде дълъг"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Грешка при запазването на заглавната част във файла със съдържание"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Грешка при обработката на съдържание %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1921,26 +1921,26 @@ msgstr ""
" -c=? Четене на този конфигурационен файл.\n"
" -o=? Настройване на произволна конфигурационна опция"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Няма съвпадения на избора"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "БД е повредена, файлът е преименуван на %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "БД е стара, опит за актуализиране на %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1948,27 +1948,22 @@ msgstr ""
"Невалиден формат на БД. Ако сте обновили от по-стара версия на apt, "
"премахнете базата от данни и я създайте наново."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Неуспех при отварянето на файл %s от БД: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Грешка при получаването на атрибути за %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Неуспех при прочитането на връзка %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "В архива няма поле „control“"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
@@ -2033,26 +2028,26 @@ msgstr "*** Неуспех при създаването на връзка %s к
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -3511,39 +3506,39 @@ msgstr "Подготовка за пълно премахване на %s"
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неуспех при записа на %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Операцията е прекъсната"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "отлагане на настройката поради неудовлетворени зависимости"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3551,7 +3546,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
"от друга грешка."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3559,7 +3554,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3567,7 +3562,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчна оперативна памет"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3576,7 +3571,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчно дисково пространство"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index c7ccd1c21..fab2f8920 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -156,9 +156,9 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -258,77 +258,77 @@ msgstr ""
" -c=? Pročitaj ovu konfiguracijsku datoteku\n"
" -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -336,151 +336,151 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -574,7 +574,7 @@ msgstr ""
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1063,7 +1063,7 @@ msgstr ""
msgid "You don't have enough free space in %s."
msgstr ""
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr ""
@@ -1215,24 +1215,24 @@ msgstr "Predloženi paketi:"
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -1631,31 +1631,31 @@ msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1697,52 +1697,47 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je stara, pokušavam nadogradnju %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, fuzzy, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Ne mogu ukloniti %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arhiva nema kontrolnog zapisa"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr ""
@@ -1807,26 +1802,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3203,61 +3198,61 @@ msgstr ""
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ne mogu zapisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3296,6 +3291,9 @@ msgstr ""
#~ msgid "However the following packages replace it:"
#~ msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Ne mogu ukloniti %s"
+
#~ msgid "Reading file listing"
#~ msgstr "Čitam spisak datoteke"
diff --git a/po/ca.po b/po/ca.po
index f44575c56..e3602d67e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -158,9 +158,9 @@ msgid " Version table:"
msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -297,47 +297,47 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "S'ha marcat %s com instaŀlat manualment.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -345,25 +345,25 @@ msgstr ""
"Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
"en el seu lloc."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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 ""
"versions «%s» a:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -385,81 +385,81 @@ msgstr ""
"per obtenir les últimes actualitzacions (possiblement no publicades) del "
"paquet.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Obtén el font %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Baixada completa i en mode de només baixada"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -468,18 +468,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +488,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +497,14 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
"%s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +513,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +522,30 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
"candidata"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Registre de canvis per a %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -686,7 +686,7 @@ msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -1188,7 +1188,7 @@ msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
@@ -1362,23 +1362,23 @@ msgstr "Paquets suggerits:"
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVÍS: No es poden autenticar els següents paquets!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "No s'ha pogut autenticar alguns paquets"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -1800,31 +1800,31 @@ msgstr "No es pot escriure en %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "La llista de les extensions dels paquets és massa llarga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "S'ha produït un error en processar el directori %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "La llista d'extensions de les fonts és massa llarga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "S'ha produït un error en processar el fitxer de continguts %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1905,26 +1905,26 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de configuració arbitrària"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "No s'ha trobat cap selecció"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "La BD és vella, s'està intentant actualitzar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1932,27 +1932,22 @@ msgstr ""
"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "No es pot obrir el fitxer de DB %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "No es pot determinar l'estat de %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "No s'ha pogut llegir l'enllaç %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arxiu sense registre de control"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
@@ -2017,26 +2012,26 @@ msgstr "*** No s'ha pogut enllaçar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -3497,37 +3492,37 @@ msgstr "S'està preparant per a suprimir completament el paquet %s"
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No es pot escriure en %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "S'han produït problemes de depències, es deixa sense configurar"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3535,7 +3530,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3543,7 +3538,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3551,7 +3546,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3560,7 +3555,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"disc ple"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 6edc89626..8f77eda68 100644
--- a/po/cs.po
+++ b/po/cs.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -155,9 +155,9 @@ msgid " Version table:"
msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -289,47 +289,47 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nelze najít balík %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ručně.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s nastaven jako instalovaný automaticky.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -337,24 +337,24 @@ msgstr ""
"Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark "
"manual“."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nelze zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nelze najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -374,80 +374,80 @@ msgstr ""
"použijte:\n"
"bzr branch %s\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nelze určit volné místo v %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Stažení zdroje %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -456,17 +456,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nelze získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -475,20 +475,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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -497,7 +497,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -506,30 +506,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Seznam změn %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -665,7 +665,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -1176,7 +1176,7 @@ msgstr "Po této operaci bude na disku uvolněno %sB.\n"
msgid "You don't have enough free space in %s."
msgstr "V %s nemáte dostatek volného místa."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
@@ -1351,23 +1351,23 @@ msgstr "Navrhované balíky:"
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Autentizační varování potlačeno.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Některé balíky nemohly být autentizovány"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Instalovat tyto balíky bez ověření?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -1784,31 +1784,31 @@ msgstr "Nelze zapsat do %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Seznam rozšíření balíku je příliš dlouhý"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Chyba zpracování adresáře %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Chyba při zapisování hlavičky do souboru"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Chyba při zpracovávání obsahu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1888,26 +1888,26 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Žádný výběr nevyhověl"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB je porušená, soubor přejmenován na %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je stará, zkouším aktualizovat %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1915,27 +1915,22 @@ msgstr ""
"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
"prosím odstraňte a poté ji znovu vytvořte."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nelze otevřít DB soubor %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Nelze vyhodnotit %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nelze přečíst link %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Archiv nemá kontrolní záznam"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nelze získat kurzor"
@@ -2000,26 +1995,26 @@ msgstr "*** Nezdařilo se slinkovat %s s %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -3445,38 +3440,38 @@ msgstr "Připravuji úplné odstranění %s"
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nelze zapsat do %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
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:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3484,7 +3479,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3492,7 +3487,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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3500,7 +3495,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3509,7 +3504,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 22b9ecf71..4296cbea6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -174,9 +174,9 @@ msgid " Version table:"
msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -317,78 +317,78 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -396,96 +396,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +494,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +503,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +519,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,32 +528,32 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -689,7 +689,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1195,7 +1195,7 @@ msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
@@ -1362,25 +1362,25 @@ msgstr "Pecynnau a awgrymmir:"
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -1806,32 +1806,32 @@ msgstr "Ni ellir ysgrifennu i %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -1913,52 +1913,47 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
@@ -2024,26 +2019,26 @@ msgstr "*** Methwyd cysylltu %s at %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -3501,61 +3496,61 @@ msgstr "Yn agor y ffeil cyfluniad %s"
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/da.po b/po/da.po
index fa8c0ec9c..67436c23c 100644
--- a/po/da.po
+++ b/po/da.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -161,9 +161,9 @@ msgid " Version table:"
msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -302,47 +302,47 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Kan ikke finde en pakke for arkitektur »%s«"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Kan ikke finde en pakke »%s« med version »%s«"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Kan ikke finde version »%s« for pakke »%s«"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s sat til automatisk installation.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -350,24 +350,24 @@ msgstr ""
"Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark "
"manual« i stedet for."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemløseren ødelagde noget"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +376,7 @@ msgstr ""
"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -387,78 +387,78 @@ msgstr ""
"bzr branch %s\n"
"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil »%s«\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,17 +467,17 @@ msgstr ""
"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
"Architectures for opsætning"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,7 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +493,14 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +509,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,30 +518,30 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
"kandidatversion"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Ændringslog for %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -678,7 +678,7 @@ msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -1211,7 +1211,7 @@ msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
@@ -1383,23 +1383,23 @@ msgstr "Foreslåede pakker:"
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Nogle pakker kunne ikke autentificeres"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Installér disse pakker uden verifikation?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -1817,31 +1817,31 @@ msgstr "Kunne ikke skrive til %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Pakkeudvidelseslisten er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Fejl under behandling af mappen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Kildeudvidelseslisten er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Fejl under skrivning af hovedet til indholdsfil"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Fejl under behandling af indhold %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1921,26 +1921,26 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Sæt en opsætnings-indstilling"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Ingen valg passede"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Visse filer mangler i pakkefilgruppen »%s«"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB var ødelagt, filen omdøbt til %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB er gammel, forsøger at opgradere %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1948,27 +1948,22 @@ msgstr ""
"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
"apt, så fjern og genskab databasen."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kunne ikke åbne DB-filen %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Kunne ikke finde %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Kunne ikke »readlink« %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrolindgang"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
@@ -2033,26 +2028,26 @@ msgstr "*** Kunne ikke lænke %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3484,38 +3479,38 @@ msgstr "Gør klar til at fjerne %s helt"
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive log (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr "Er /dev/pts monteret?"
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr "Er standardud en terminal?"
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Handling blev afbrudt før den kunne afsluttes"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3523,14 +3518,14 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
"opfølgningsfejl fra en tidligere fejl."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3538,7 +3533,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
"hukommelsesfejl"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3546,7 +3541,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
"system"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
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"
diff --git a/po/de.po b/po/de.po
index 5ae2fc239..0b4780ac3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr " Versionstabelle:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -304,47 +304,47 @@ msgstr ""
" -c=? Diese Konfigurationsdatei lesen\n"
" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert."
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Paket %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s wurde als automatisch installiert festgelegt.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -352,26 +352,26 @@ msgstr ""
"Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« "
"und »apt-mark manual«."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden."
-#: cmdline/apt-get.cc:785
+#: 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 ""
"auf:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -393,80 +393,80 @@ msgstr ""
"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
"für das Paket abzurufen.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden."
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen.\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -475,18 +475,18 @@ msgstr ""
"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
"finden Sie unter apt.conf(5) APT::Architectures."
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bauabhängigkeiten.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +495,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -504,14 +504,14 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -521,7 +521,7 @@ msgstr ""
"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
"erfüllen kann."
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -530,30 +530,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -700,7 +700,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1231,7 +1231,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
@@ -1408,23 +1408,23 @@ msgstr "Vorgeschlagene Pakete:"
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Authentifizierungswarnung überstimmt.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Einige Pakete konnten nicht authentifiziert werden."
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Diese Pakete ohne Überprüfung installieren?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
@@ -1849,31 +1849,31 @@ msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Paketerweiterungsliste ist zu lang."
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Quellerweiterungsliste ist zu lang."
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Fehler beim Verarbeiten der Inhalte %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1960,26 +1960,26 @@ msgstr ""
" -c=? diese Konfigurationsdatei lesen\n"
" -o=? eine beliebige Konfigurationsoption setzen"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Keine Auswahl traf zu"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1988,27 +1988,22 @@ msgstr ""
"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
"und erstellen Sie sie neu."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s mit »stat« abfragen fehlgeschlagen"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink von %s fehlgeschlagen"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Archiv hat keinen Steuerungsdatensatz."
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Unmöglich, einen Cursor zu bekommen"
@@ -2073,26 +2068,26 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -3569,39 +3564,39 @@ msgstr "Vollständiges Entfernen von %s wird vorbereitet."
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Schreiben nach %s nicht möglich"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3609,7 +3604,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3617,7 +3612,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3625,7 +3620,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen erschöpftem Arbeitsspeicher hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3634,7 +3629,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen voller Festplatte hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 881a612b3..c84b506ec 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -303,77 +303,77 @@ msgstr ""
" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
" -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -381,116 +381,116 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -499,37 +499,37 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -667,7 +667,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1166,7 +1166,7 @@ msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི
msgid "You don't have enough free space in %s."
msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
@@ -1330,24 +1330,24 @@ msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ
msgid "Recommended packages:"
msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "Install these packages without verification?"
msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -1766,31 +1766,31 @@ msgstr " %sལུ་འབྲི་མ་ཚུགས།"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1874,26 +1874,26 @@ msgstr ""
" -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
" -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1902,27 +1902,22 @@ msgstr ""
"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་"
"པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
@@ -1987,26 +1982,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -3427,61 +3422,61 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 69d6b09f5..2292b2981 100644
--- a/po/el.po
+++ b/po/el.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -167,9 +167,9 @@ msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -309,81 +309,81 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -391,96 +391,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +489,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο "
"πακέτο %s"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +497,14 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +513,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +522,30 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
"υποψήφιαέκδοση"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog για %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -681,7 +681,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -1182,7 +1182,7 @@ msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερ
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
@@ -1351,23 +1351,23 @@ msgstr "Προτεινόμενα πακέτα:"
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -1788,31 +1788,31 @@ msgstr "Αδύνατη η εγγραφή στο %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1896,26 +1896,26 @@ msgstr ""
" -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Δεν ταιριαξε καμία επιλογή"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1924,27 +1924,22 @@ msgstr ""
"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Αποτυχία ανάγνωσης του %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
@@ -2009,26 +2004,26 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -3458,61 +3453,61 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Αδύνατη η εγγραφή στο %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 19c862a55..f7de1cf2e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -212,9 +212,9 @@ msgid " Version table:"
msgstr " Tabla de versión:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -357,71 +357,71 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
" cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorar la versión no disponible «%s» del paquete «%s»"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "fijado %s como instalado automáticamente.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solución de problemas rompió algunas cosas"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -431,7 +431,7 @@ msgstr ""
"versiones «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -443,97 +443,97 @@ msgstr ""
"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
"del paquete.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitiendo el fichero ya descargado «%s»\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de sólo descarga"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento «%s».\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción «%s».\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -542,7 +542,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -551,14 +551,14 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -567,7 +567,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -576,30 +576,30 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectando a %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -739,7 +739,7 @@ msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -1238,7 +1238,7 @@ msgstr "Se liberarán %sB después de esta operación.\n"
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Hay problemas y se utilizó -y sin --force-yes"
@@ -1413,23 +1413,23 @@ msgstr "Paquetes sugeridos:"
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticación ignorado.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Algunos paquetes no se pueden autenticar"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "¿Instalar estos paquetes sin verificación?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -1853,31 +1853,31 @@ msgstr "No se puede escribir en %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "La lista de extensión de paquetes es demasiado larga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Error procesando el directorio %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "La lista de extensión de fuentes es demasiado larga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Error escribiendo cabeceras de archivos de contenido"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Error procesando contenidos %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1962,26 +1962,26 @@ msgstr ""
" -c=? Lee este archivo de configuración\n"
" -o=? Establece una opción de configuración arbitraria"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Ninguna selección coincide"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "BD dañada, se renombró el archivo a %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB anticuada, intentando actualizar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1989,27 +1989,22 @@ msgstr ""
"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
"de datos si vd. se actualizó de una versión anterior de apt."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "No se pudo abrir el archivo DB %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "No pude leer %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "No se pudo leer el enlace %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "No hay registro de control del archivo"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
@@ -2074,26 +2069,26 @@ msgstr "*** No pude enlazar %s con %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -3556,39 +3551,39 @@ msgstr "Preparándose para eliminar completamente %s"
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "No se puede escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - dejando sin instalar"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3596,7 +3591,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3604,7 +3599,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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3612,7 +3607,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica un "
"error de memoria excedida"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3621,7 +3616,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/eu.po b/po/eu.po
index b2ad35c83..351cff4af 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -299,77 +299,77 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -377,97 +377,97 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -475,7 +475,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -483,14 +483,14 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -499,7 +499,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -507,30 +507,30 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -666,7 +666,7 @@ msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -1165,7 +1165,7 @@ msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
msgid "You don't have enough free space in %s."
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
@@ -1339,23 +1339,23 @@ msgstr "Iradokitako paketeak:"
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Egiaztapen abisua gainidazten.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Zenbait pakete ezin dira egiaztatu"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Paketeak egiaztapen gabe instalatu?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -1772,31 +1772,31 @@ msgstr "%s : ezin da idatzi"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Pakete luzapenen zerrenda luzeegia da"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Errorea direktorioa prozesatzean %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Iturburu luzapenen zerrenda luzeegia da"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Errorea eduki fitxategiaren goiburua idaztean"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Errorea edukiak prozesatzean %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1875,26 +1875,26 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Ez dago bat datorren hautapenik"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1903,27 +1903,22 @@ msgstr ""
"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
"mesedez datubasea ezabatu eta birsortu."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Huts egin du %s(e)tik datuak lortzean"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Huts egin du %s esteka irakurtzean"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Artxiboak ez du kontrol erregistrorik"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
@@ -1988,26 +1983,26 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -3426,61 +3421,61 @@ msgstr "%s guztiz ezabatzeko prestatzen"
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s : ezin da idatzi"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 44e77665a..8dcdd8d6c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -158,9 +158,9 @@ msgid " Version table:"
msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -296,77 +296,77 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -374,96 +374,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -471,7 +471,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -479,14 +479,14 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -495,7 +495,7 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -503,30 +503,30 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -661,7 +661,7 @@ msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -1156,7 +1156,7 @@ msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
msgid "You don't have enough free space in %s."
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
@@ -1331,23 +1331,23 @@ msgstr "Ehdotetut paketit:"
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Varoitus varmistamisesta on ohitettu.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Asennetaanko nämä paketit ilman todennusta?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -1765,32 +1765,32 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Paketin laajennuslista on liian pitkä"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lähteiden laajennuslista on liian pitkä"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr ""
"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1872,26 +1872,26 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Mitkään valinnat eivät täsmänneet"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Tietokanta on vanha, yritetään päivittää %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1900,27 +1900,22 @@ msgstr ""
"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
"on tietokanta poistettava ja luotava uudelleen."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Tiedostolle %s ei toimi stat"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink %s ei onnistunut"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arkistolla ei ole ohjaustietuetta"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
@@ -1985,26 +1980,26 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -3418,61 +3413,61 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan"
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index c3af4315a..6bc6e4dd9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -157,9 +157,9 @@ msgid " Version table:"
msgstr " Table de version :"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -305,53 +305,53 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s passé en « installé manuellement ».\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s passé en « installé automatiquement ».\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -359,26 +359,26 @@ msgstr ""
"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
"mark manual »."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de résolution du problème a cassé certaines "
"parties"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -388,7 +388,7 @@ msgstr ""
"suivi de versions « %s » à l'adresse :\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -400,80 +400,80 @@ msgstr ""
"pour récupérer les dernières mises à jour (éventuellement non encore "
"publiées) du paquet.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
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:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -483,17 +483,17 @@ msgstr ""
"consulter la section à propos de APT::Architectures dans la page de manuel "
"apt.conf(5)."
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -502,7 +502,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -511,14 +511,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -527,7 +527,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -536,31 +536,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Journal des modifications pour %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -699,7 +699,7 @@ msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -1231,7 +1231,7 @@ msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
@@ -1415,23 +1415,23 @@ msgstr "Paquets suggérés :"
msgid "Recommended packages:"
msgstr "Paquets recommandés :"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Avertissement d'authentification ignoré.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Certains paquets n'ont pas pu être authentifiés"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Faut-il installer ces paquets sans vérification ?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
@@ -1857,31 +1857,31 @@ msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "La liste d'extension du paquet est trop longue"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Erreur lors du traitement du répertoire %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "La liste d'extension des sources est trop grande"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Erreur du traitement du contenu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1964,27 +1964,27 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Place une option de configuration arbitraire"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Aucune sélection ne correspond"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Base de données corrompue, fichier renommé en %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Base de données ancienne, tentative de mise à jour de %s\""
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1992,27 +1992,22 @@ msgstr ""
"Le format de la base de données n'est pas valable. Si vous mettez APT à "
"jour, veuillez supprimer puis recréer la base de données."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Impossible de statuer %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Impossible de lire le lien %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "L'archive n'a pas d'enregistrement de contrôle"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
@@ -2077,26 +2072,26 @@ msgstr "*** Impossible de lier %s à %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
@@ -3592,37 +3587,37 @@ msgstr "Préparation de la suppression complète de %s"
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossible d'écrire sur %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "L'opération a été interrompue avant de se terminer"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problème de dépendances : laissé non configuré"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3630,14 +3625,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3645,7 +3640,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3653,7 +3648,7 @@ msgid ""
msgstr ""
"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 244291d27..b0d7388df 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -302,70 +302,70 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Non foi posíbel atopar o paquete %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiado a instalado manualmente.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s está estabelecido para a súa instalación automática.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Non é posíbel bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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 ""
"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -386,97 +386,97 @@ msgstr ""
"para obter as últimas actualizacións (posibelmente non publicadas) do "
"paquete.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado «%s»\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Non se puideron obter algúns arquivos."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetado «%s».\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a orde de construción de «%s».\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +485,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +494,14 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +510,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +519,30 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Non se puideron procesar as dependencias de construción"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Rexistro de cambios de %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -684,7 +684,7 @@ msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -1186,7 +1186,7 @@ msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n"
msgid "You don't have enough free space in %s."
msgstr "Non hai espazo libre abondo en %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
@@ -1363,23 +1363,23 @@ msgstr "Paquetes suxeridos:"
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Ignórase o aviso de autenticación.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Non foi posíbel autenticar algúns paquetes"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Instalar estes paquetes sen verificación?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
@@ -1801,31 +1801,31 @@ msgstr "Non é posíbel escribir en %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "A lista de extensións de paquetes é longa de máis"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Produciuse un erro ao procesar o directorio %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "A lista de extensións de fontes é longa de máis"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Produciuse un erro ao procesar o contido %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1908,26 +1908,26 @@ msgstr ""
" -c=? Le este ficheiro de configuración\n"
" -o=? Estabelece unha opción de configuración"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Non coincide ningunha selección"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "A base de datos é antiga, tentando anovar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1935,27 +1935,22 @@ msgstr ""
"O formato da base de datos non é correcto. Se a anovou desde unha versión "
"antiga de apt, retirea e volva a crear a base de datos"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Non foi posíbel determinar o estado %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Non foi posíbel ler a ligazón %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "O arquivo non ten un rexistro de control"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Non é posíbel obter un cursor"
@@ -2020,26 +2015,26 @@ msgstr "*** Non foi posíbel ligar %s con %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Acadouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de «override» de código fonte\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -3498,39 +3493,39 @@ msgstr "Preparándose para retirar %s completamente"
msgid "Completely removed %s"
msgstr "Retirouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Non é posíbel escribir en %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - déixase sen configurar"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3538,7 +3533,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3546,7 +3541,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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3554,7 +3549,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3563,7 +3558,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cba9a307e..45ab13ec6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -295,48 +295,48 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
"A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésűre állítva.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s megjelölve automatikusan telepítettként.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -344,25 +344,25 @@ msgstr ""
"Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark "
"auto” parancsokat."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, a problémamegoldó hibát okozott"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nem lehet zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"karbantartva:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -383,80 +383,80 @@ msgstr ""
"bzr branch %s\n"
"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
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:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "„%s” kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "„%s” elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,17 +465,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, 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:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,7 +484,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +493,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +509,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,30 +518,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Változási napló ehhez: %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -680,7 +680,7 @@ msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, 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"
@@ -1197,7 +1197,7 @@ msgstr "A művelet után %sB lemezterület szabadul fel.\n"
msgid "You don't have enough free space in %s."
msgstr "Nincs elég szabad hely itt: %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
@@ -1370,23 +1370,23 @@ msgstr "Javasolt csomagok:"
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Néhány csomag nem hitelesíthető"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -1806,31 +1806,31 @@ msgstr "Nem lehet írni ebbe: %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "A csomagkiterjesztések listája túl hosszú"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "A forráskiterjesztések listája túl hosszú"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Hiba a tartalomfájl fejlécének írásakor"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Hiba %s tartalmának feldolgozásakor"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1912,26 +1912,26 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nincs illeszkedő kiválasztás"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "A DB régi, kísérlet a következő frissítésére: %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1939,27 +1939,22 @@ msgstr ""
"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
"frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s elérése sikertelen"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink nem hajtható végre erre: %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Az archívumnak nincs vezérlő rekordja"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
@@ -2024,26 +2019,26 @@ msgstr "*** %s linkelése sikertelen ehhez: %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " a DeLink korlátja (%sB) elérve.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
@@ -3498,37 +3493,37 @@ msgstr "%s teljes eltávolításának előkészítése"
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nem lehet írni ebbe: %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "függőségi hibák - a csomag beállítatlan maradt"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3536,7 +3531,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3544,7 +3539,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
"lemez"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3552,7 +3547,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3560,7 +3555,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 8808526c1..ee32853fd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Tabella versione:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -305,50 +305,50 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare il pacchetto %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "È stato impostato %s per l'installazione manuale.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s impostato automaticamente come installato.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -356,25 +356,25 @@ msgstr ""
"Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual"
"\" al suo posto."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -384,7 +384,7 @@ msgstr ""
"all'interno del sistema di controllo della versione \"%s\" presso:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -396,80 +396,80 @@ msgstr ""
"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
"pacchetto.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero in %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario scaricare %sB di sorgenti.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -478,17 +478,17 @@ msgstr ""
"Informazioni sull'architettura non disponibili per %s. Consultare apt."
"conf(5) APT::Architectures per l'impostazione"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -497,7 +497,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
"consentito su pacchetti \"%s\""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -506,14 +506,14 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -522,7 +522,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -531,30 +531,30 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
"non ha una versione candidata"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -694,7 +694,7 @@ msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -1220,7 +1220,7 @@ msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
msgid "You don't have enough free space in %s."
msgstr "Spazio libero in %s insufficiente."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
@@ -1399,23 +1399,23 @@ msgstr "Pacchetti suggeriti:"
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Avviso di autenticazione disabilitato.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Alcuni pacchetti non possono essere autenticati"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Installare questi pacchetti senza verificarli?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
@@ -1841,31 +1841,31 @@ msgstr "Impossibile scrivere in %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Impossibile trovare la versione di debconf. È installato?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Errore nell'elaborare la directory %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Errore nell'elaborare i contenuti %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1946,26 +1946,26 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione arbitraria di configurazione"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nessuna selezione corrisponde"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Il database è vecchio, tentativo di aggiornamento %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1973,27 +1973,22 @@ msgstr ""
"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
"una vecchia versione di apt, rimuovere e ricreare il database."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Impossibile aprire il file del database %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Impossibile eseguire stat su %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Esecuzione di readlink su %s non riuscita"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "L'archivio non ha un campo \"control\""
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Impossibile ottenere un cursore"
@@ -2061,26 +2056,26 @@ msgstr "*** Collegamento di %s a %s non riuscito"
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -3562,39 +3557,39 @@ msgstr "Preparazione alla rimozione completa di %s"
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossibile scrivere in %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "L'operazione è stata interrotta prima di essere completata"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3602,7 +3597,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica la "
"presenza di un fallimento precedente."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3610,7 +3605,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3618,7 +3613,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore di memoria esaurita"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3627,7 +3622,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore per disco pieno."
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 27196705a..e2899aaf9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.16.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2014-03-21 19:53+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -157,9 +157,9 @@ msgid " Version table:"
msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -299,47 +299,47 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "アーキテクチャ '%s' 用のパッケージは見つかりませんでした"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "パッケージ '%s' のバージョン '%s' は見つかりませんでした"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "リリース '%2$s' にはパッケージ '%1$s' は見つかりませんでした"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "パッケージ '%2$s' のバージョン '%1$s' は見つかりませんでした"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s は手動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s は自動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -347,25 +347,25 @@ msgstr ""
"このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり"
"に使用してください。"
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"ます:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -387,80 +387,80 @@ msgstr ""
"bzr branch %s\n"
"を使用してください。\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,17 +469,17 @@ msgstr ""
"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt."
"conf(5) の APT::Architectures を参照してください。"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -488,7 +488,7 @@ msgstr ""
"パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s "
"の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +497,14 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +513,7 @@ msgstr ""
"パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた"
"め、%2$s に対する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +522,30 @@ msgstr ""
"パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
"係を満たすことができません"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) の変更履歴"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -694,7 +694,7 @@ msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -1232,7 +1232,7 @@ msgstr "この操作後に %sB のディスク容量が解放されます。\n"
msgid "You don't have enough free space in %s."
msgstr "%s に充分な空きスペースがありません。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
@@ -1400,23 +1400,23 @@ msgstr "提案パッケージ:"
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "警告: 以下のパッケージは認証されていません!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "認証の警告は上書きされました。\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "いくつかのパッケージを認証できませんでした"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "検証なしにこれらのパッケージをインストールしますか?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -1833,31 +1833,31 @@ msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"debconf のバージョンを取得できません。debconf はインストールされていますか?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "パッケージ拡張子リストが長すぎます"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "ディレクトリ %s の処理中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "ソース拡張子リストが長すぎます"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Contents %s の処理中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1938,26 +1938,26 @@ msgstr ""
" -c=? 指定の設定ファイルを読む\n"
" -o=? 任意の設定オプションを設定する"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "選択にマッチするものがありません"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB が古いため、%s のアップグレードを試みます"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1965,27 +1965,22 @@ msgstr ""
"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
"ベースを削除し、再作成してください。"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "DB ファイル %s を開くことができません: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s の状態を取得するのに失敗しました"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s のリンク読み取りに失敗しました"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "アーカイブにコントロールレコードがありません"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
@@ -2050,26 +2045,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました"
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -3517,37 +3512,37 @@ msgstr "%s を完全に削除する準備をしています"
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr "ioctl(TIOCGWINSZ) に失敗しました"
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, c-format
msgid "Can not write log (%s)"
msgstr "ログを書き込めません (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr "/dev/pts はマウントされていますか?"
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr "標準出力はターミナルですか?"
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "操作はそれが完了する前に中断されました"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "依存関係の問題 - 未設定のままにしています"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3555,7 +3550,7 @@ msgstr ""
"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3563,7 +3558,7 @@ msgstr ""
"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
"き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3571,7 +3566,7 @@ msgstr ""
"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
"込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3579,7 +3574,7 @@ msgstr ""
"エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/km.po b/po/km.po
index cea7d939c..258395bb2 100644
--- a/po/km.po
+++ b/po/km.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -301,77 +301,77 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -379,114 +379,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -495,37 +495,37 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -659,7 +659,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1148,7 +1148,7 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​
msgid "You don't have enough free space in %s."
msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
@@ -1312,24 +1312,24 @@ msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោប
msgid "Recommended packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "Install these packages without verification?"
msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -1744,31 +1744,31 @@ msgstr "មិន​អាច​សរសេរ​ទៅ %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1849,26 +1849,26 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1877,27 +1877,22 @@ msgstr ""
"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
@@ -1962,26 +1957,26 @@ msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -3391,61 +3386,61 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index c2f00b49b..e222c93ab 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -153,9 +153,9 @@ msgid " Version table:"
msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -292,70 +292,70 @@ msgstr ""
" -c=? 해당 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다."
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 패키지는 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉터리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -364,7 +364,7 @@ msgstr ""
"알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -375,95 +375,95 @@ msgstr ""
"다음과 같이 하십시오:\n"
"bzr get %s\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는데 실패했습니다."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -472,7 +472,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -481,14 +481,14 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -497,7 +497,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -506,30 +506,30 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -666,7 +666,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1158,7 +1158,7 @@ msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
msgid "You don't have enough free space in %s."
msgstr "%s 안에 충분한 여유 공간이 없습니다."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
@@ -1324,23 +1324,23 @@ msgstr "제안하는 패키지:"
msgid "Recommended packages:"
msgstr "추천하는 패키지:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "인증 경고를 무시합니다.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "인증할 수 없는 패키지가 있습니다"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
@@ -1758,31 +1758,31 @@ msgstr "%s에 쓸 수 없습니다"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "패키지 확장 목록이 너무 깁니다"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "소스 확장 목록이 너무 깁니다"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1863,26 +1863,26 @@ msgstr ""
" -c=? 이 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "맞는 패키지가 없습니다"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1890,28 +1890,23 @@ msgstr ""
"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
"지우고 다시 만드십시오."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s의 정보를 읽는데 실패했습니다"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s 파일에 readlink하는데 실패했습니다"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "아카이브에 컨트롤 기록이 없습니다"
# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
@@ -1977,26 +1972,26 @@ msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -3416,37 +3411,37 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s에 쓸 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3454,20 +3449,20 @@ msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
"적인 오류입니다."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3475,7 +3470,7 @@ msgid ""
msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ku.po b/po/ku.po
index ee451122c..58e443bb2 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -161,9 +161,9 @@ msgid " Version table:"
msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -264,77 +264,77 @@ msgstr ""
" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
"mînak -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -342,151 +342,151 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -580,7 +580,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1069,7 +1069,7 @@ msgstr ""
msgid "You don't have enough free space in %s."
msgstr "Cihê vala li %s têre nake."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr ""
@@ -1221,23 +1221,23 @@ msgstr "Paketên tên pêşniyaz kirin:"
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr ""
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -1635,31 +1635,31 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Di şixulandina pêrista %s de çewtî"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Dema şixulandina naveroka %s çewtî"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1701,52 +1701,47 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Danegira %s nehate vekirin: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Rakirina %s biserneket"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Tomara kontrola arşîvê tuneye"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr ""
@@ -1811,26 +1806,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3220,61 +3215,61 @@ msgstr "Bi tevahî rakirina %s tê amadekirin"
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3316,6 +3311,9 @@ msgstr ""
#~ msgid "MD5Sum mismatch"
#~ msgstr "MD5Sum li hev nayên"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Rakirina %s biserneket"
+
#~ msgid "Unable to create %s"
#~ msgstr "Nikare %s biafirîne"
diff --git a/po/lt.po b/po/lt.po
index 6503b476a..b55e148be 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -159,9 +159,9 @@ msgid " Version table:"
msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -261,77 +261,77 @@ msgstr ""
" -c=? Nuskaityti pateiktą konfigūracijos failą\n"
" -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -339,95 +339,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Parsiunčiamas archyvas %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -435,7 +435,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -443,14 +443,14 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -459,7 +459,7 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -467,30 +467,30 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -585,7 +585,7 @@ msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1070,7 +1070,7 @@ msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
msgid "You don't have enough free space in %s."
msgstr "%s nėra pakankamai laisvos vietos."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
@@ -1234,23 +1234,23 @@ msgstr "Siūlomi paketai:"
msgid "Recommended packages:"
msgstr "Rekomenduojami paketai:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Nepavyko autentikuoti kai kurių paketų"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Įdiegti šiuos paketus be patvirtinimo?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
@@ -1671,31 +1671,31 @@ msgstr "Nepavyko įrašyti į %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Paketo plėtinių sąrašas yra per ilgas"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Klaida apdorojant aplanką %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Šaltinio plėtinys yra per ilgas"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Klaida įrašant antraštę į turinio failą"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Klaida apdorojant turinį %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1781,26 +1781,26 @@ msgstr ""
" -c=? Perskaityti šį nuostatų failą\n"
" -o=? Nustatyti savarankišką konfigūracijos nuostatą"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nėra atitikmenų"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Kai kurių failų nėra paketų grupėje „%s“"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1809,27 +1809,22 @@ msgstr ""
"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Nepavyko patikrinti %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nepavyko nuskaityti nuorodos %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr ""
@@ -1894,26 +1889,26 @@ msgstr "*** Nepavyko susieti %s su %s"
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -3316,61 +3311,61 @@ msgstr "Ruošiamasi visiškai pašalinti %s"
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nepavyko įrašyti į %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index ab86b836a..839e0f310 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -156,9 +156,9 @@ msgid " Version table:"
msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -295,77 +295,77 @@ msgstr ""
" -c= ? ही संरचना संचिका वाचा \n"
" -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -373,114 +373,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -489,37 +489,37 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -655,7 +655,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -1146,7 +1146,7 @@ msgstr "या क्रियेनंतर, %sB डिस्क जागा
msgid "You don't have enough free space in %s."
msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
@@ -1316,24 +1316,24 @@ msgstr "सुचवलेली पॅकेजेस:"
msgid "Recommended packages:"
msgstr "शिफारस केलेली पॅकेजेस:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "Install these packages without verification?"
msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -1749,31 +1749,31 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ "
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "त्रुटी प्रक्रिया मजकूर %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1854,26 +1854,26 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "निवडक भाग जुळत नाही"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1882,27 +1882,22 @@ msgstr ""
"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s स्टेट करण्यास असमर्थ"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s वाचणारा दुवा असमर्थ"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
@@ -1967,26 +1962,26 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ"
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -3403,61 +3398,61 @@ msgstr "%s संपूर्ण काढून टाकण्याची त
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 5823f1dc4..17bedfa9b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -161,9 +161,9 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -301,70 +301,70 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke å finne pakken %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s satt til automatisk installasjon.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemløser ødela noe"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -384,116 +384,116 @@ msgstr ""
"bzr get %s\n"
"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,37 +502,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:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Kobler til %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -670,7 +670,7 @@ msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -1166,7 +1166,7 @@ msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
msgid "You don't have enough free space in %s."
msgstr "Dessverre, ikke nok ledig plass i %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
@@ -1338,23 +1338,23 @@ msgstr "Foreslåtte pakker:"
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Autentiseringsadvarsel overstyrt.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Noen pakker ble ikke autentisert"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Installer disse pakkene uten verifikasjon?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
@@ -1775,31 +1775,31 @@ msgstr "Kan ikke skrive til %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lista over pakkeutvidelser er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Feil ved lesing av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista over kildeutvidelser er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Feil ved skriving av topptekst til innholdsfila"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Det oppsto en feil ved lesing av %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1881,26 +1881,26 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Setter en vilkårlig innstilling"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Ingen utvalg passet"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer mangler i pakkegruppa «%s»"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Databasen er gammel, forsøker å oppgradere %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1908,27 +1908,22 @@ msgstr ""
"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
"fjern og så gjenopprett databasen."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikke å åpne Databasefila %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikke å få statusen på %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikke å lese lenken %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
@@ -1993,26 +1988,26 @@ msgstr "*** Klarte ikke å lenke %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -3442,37 +3437,37 @@ msgstr "Forbereder å fullstendig slette %s"
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan ikke skrive til %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "avhengighetsproblemer - lar den være uoppsatt"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3480,7 +3475,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
"følgefeil fra en tidligere feil."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3488,7 +3483,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3496,7 +3491,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
"minne»-feil"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3505,7 +3500,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
"feil"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 6b963e63a..db867948f 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -159,9 +159,9 @@ msgid " Version table:"
msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -299,77 +299,77 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -377,114 +377,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -493,37 +493,37 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -657,7 +657,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1147,7 +1147,7 @@ msgstr "%sB अनप्याक गरिसके पछि डिस्क
msgid "You don't have enough free space in %s."
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
@@ -1313,24 +1313,24 @@ msgstr "सुझाव दिएका प्याकेजहरू:"
msgid "Recommended packages:"
msgstr "सिफारिस गरिएका प्याकेजहरू:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
#, fuzzy
msgid "Install these packages without verification?"
msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
@@ -1747,31 +1747,31 @@ msgstr " %s मा लेख्न असक्षम"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "प्याकेज विस्तार सूचि अति लामो छ"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "स्रोत विस्तार सूचि अति लामो छ"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1854,52 +1854,47 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "कुनै चयनहरू मेल खाएन"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "DB फाइल %s असक्षम भयो: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr " %s स्थिर गर्न असफल"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "लिङ्क पढ्न असफल %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
@@ -1964,26 +1959,26 @@ msgstr "*** %s मा %s लिङ्क असफल भयो"
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -3394,61 +3389,61 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr " %s मा लेख्न असक्षम"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4a84d05b0..462ec6782 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -159,9 +159,9 @@ msgid " Version table:"
msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -301,72 +301,72 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Kon geen enkel pakket vinden bij regex '%s'"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s is ingesteld voor handmatige installatie.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +376,7 @@ msgstr ""
"'%s' op:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -388,97 +388,97 @@ msgstr ""
"om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
"te halen.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,14 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +512,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +521,30 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -684,7 +684,7 @@ msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1185,7 +1185,7 @@ msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
msgid "You don't have enough free space in %s."
msgstr "U heeft onvoldoende vrije schijfruimte op %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
@@ -1359,24 +1359,24 @@ msgstr "Voorgestelde pakketten:"
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Authentificatiewaarschuwing is genegeerd.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Sommige pakketten konden niet geauthentificeerd worden"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Wilt u deze pakketten installeren zonder verificatie?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
@@ -1801,31 +1801,31 @@ msgstr "Kan niet naar %s schrijven"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Pakket-extensielijst is te lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Fout bij het verwerken van map %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Bron-extensielijst is te lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Fout bij het verwerken van de inhoud van %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1909,26 +1909,26 @@ msgstr ""
" -c=? Lees dit configuratiebestand in\n"
" -o=? Stel een willekeurige configuratie optie in"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Geen van de selecties kwam overeen"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1936,27 +1936,22 @@ msgstr ""
"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
"apt, dient u de database te verwijderen en opnieuw aan te maken."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kan het DB-bestand %s niet openen: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "stat op %s is mislukt"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink op %s is mislukt"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Archief heeft geen 'control'-record"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
@@ -2021,26 +2016,26 @@ msgstr "*** Linken van %s aan %s is mislukt"
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB bereikt.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -3498,39 +3493,39 @@ msgstr "Volledige verwijdering van %s wordt voorbereid"
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kan niet naar %s schrijven"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemen met vereisten - wordt niet geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3538,7 +3533,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
"eerdere mislukking."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3546,7 +3541,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3554,7 +3549,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over onvoldoende-geheugen."
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3563,7 +3558,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over een volle schijf."
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 343c5f8ff..e17ff148a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -161,9 +161,9 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -303,78 +303,78 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -382,115 +382,115 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -499,37 +499,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:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Koplar til %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -664,7 +664,7 @@ msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -1157,7 +1157,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
msgid "You don't have enough free space in %s."
msgstr "Du har ikkje nok ledig plass i %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
@@ -1323,23 +1323,23 @@ msgstr "Fresltte pakkar:"
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "TVARING: Klarer ikkje autentisere desse pakkane."
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Nokre pakkar kunne ikkje bli autentisert"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Installer desse pakkane utan verifikasjon?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -1756,31 +1756,31 @@ msgstr "Klarte ikkje skriva til %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lista over pakkeutvidingar er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Feil ved lesing av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista over kjeldeutvidingar er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Feil ved skriving av topptekst til innhaldsfila"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Feil ved lesing av %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -1860,52 +1860,47 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Set ei vilkrleg innstilling."
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Ingen utval passa"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer manglar i pakkefilgruppa %s"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB er for gammal, forskjer oppgradere %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikkje opna DB-fila %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikkje f status til %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikkje lesa lenkja %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
@@ -1970,26 +1965,26 @@ msgstr "*** Klarte ikkje lenkja %s til %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -3406,61 +3401,61 @@ msgstr "Opnar oppsettsfila %s"
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Klarte ikkje skriva til %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0840d0e6d..4aaea8691 100644
--- a/po/pl.po
+++ b/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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -163,9 +163,9 @@ msgid " Version table:"
msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -299,50 +299,50 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s zaznaczony jako zainstalowany automatycznie.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -350,26 +350,26 @@ msgstr ""
"To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-"
"mark manual\"."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -379,7 +379,7 @@ msgstr ""
"pod adresem:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -391,80 +391,80 @@ msgstr ""
"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
"pakietu.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobieranie źródeł %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -473,17 +473,17 @@ msgstr ""
"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -492,7 +492,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -501,14 +501,14 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -517,7 +517,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -526,30 +526,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Dziennik zmian %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -688,7 +688,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -1210,7 +1210,7 @@ msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
@@ -1398,23 +1398,23 @@ msgstr "Sugerowane pakiety:"
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Zainstalować te pakiety bez weryfikacji?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -1840,31 +1840,31 @@ msgstr "Nie udało się pisać do %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lista rozszerzeń pakietów jest zbyt długa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Błąd przetwarzania katalogu %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista rozszerzeń źródeł jest zbyt długa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Błąd podczas przetwarzania zawartości %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1947,26 +1947,26 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny\n"
" -o=? Ustawia dowolną opcję konfiguracji"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nie dopasowano żadnej nazwy"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\""
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1974,27 +1974,22 @@ msgstr ""
"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
"usunąć i utworzyć ponownie bazę danych."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nie udało się otworzyć pliku bazy %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Nie udało się wykonać operacji stat na %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie udało się odczytać dowiązania %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Archiwum nie posiada rekordu kontrolnego"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
@@ -2059,26 +2054,26 @@ msgstr "*** Nie udało się dowiązać %s do %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -3529,37 +3524,37 @@ msgstr "Przygotowywanie do całkowitego usunięcia %s"
msgid "Completely removed %s"
msgstr "Pakiet %s został całkowicie usunięty"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nie udało się pisać do %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3567,7 +3562,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3575,7 +3570,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3583,7 +3578,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
"braku wolnej pamięci"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3592,7 +3587,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
"przepełnienie dysku"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 8037bc77b..1c7a41915 100644
--- a/po/pt.po
+++ b/po/pt.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -159,9 +159,9 @@ msgid " Version table:"
msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -297,47 +297,47 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s está definido para ser instalado automaticamente.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -345,24 +345,24 @@ msgstr ""
"Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' "
"e 'apt-mark manual'."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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 ""
"'%s' em:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -383,81 +383,81 @@ msgstr ""
"bzr branch %s\n"
"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,18 +466,18 @@ msgstr ""
"Nenhuma informação de arquitectura disponível para %s. Para configuração "
"veja apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +486,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +495,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +511,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +520,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changlog para %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -682,7 +682,7 @@ msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -1200,7 +1200,7 @@ msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço livre suficiente em %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e foi utilizado -y sem --force-yes"
@@ -1372,23 +1372,23 @@ msgstr "Pacotes sugeridos:"
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticação ultrapassado.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Instalar estes pacotes sem verificação?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -1812,31 +1812,31 @@ msgstr "Não conseguiu escrever para %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "A lista de extensão de pacotes é demasiado longa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Erro ao processar o directório %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista de extensão de códigos-fonte é demasiado longa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Erro ao processar o conteúdo %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1917,26 +1917,26 @@ msgstr ""
" -c=? Ler este ficheiro de configuração\n"
" -o=? Definir uma opção de configuração arbitrária"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nenhuma selecção coincidiu"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "A base de dados é antiga, a tentar actualizar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1944,27 +1944,22 @@ msgstr ""
"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
"apt, por favor remova-a e crie novamente a base de dados."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Falha stat %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou o readlink %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "O arquivo não tem registo de controlo"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
@@ -2029,26 +2024,26 @@ msgstr "*** Falhou ligar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -3516,37 +3511,37 @@ msgstr "A preparar para remover completamente %s"
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Não conseguiu escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "A operação foi interrompida antes de poder terminar"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependências - deixando por configurar"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3554,7 +3549,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3562,7 +3557,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3570,7 +3565,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
"memória esgotada"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3579,7 +3574,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
"cheio"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
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 543a69f2f..ea227b290 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -159,9 +159,9 @@ msgid " Version table:"
msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -303,77 +303,77 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -381,97 +381,97 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -480,7 +480,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -489,14 +489,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +505,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,30 +514,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectando em %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -674,7 +674,7 @@ msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -1173,7 +1173,7 @@ msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço suficiente em %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e -y foi usado sem --force-yes"
@@ -1347,23 +1347,23 @@ msgstr "Pacotes sugeridos:"
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Aviso de autenticação sobreposto.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Instalar estes pacotes sem verificação?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -1786,31 +1786,31 @@ msgstr "Impossível escrever para %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lista de extensão de pacotes é muito extensa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Erro processando o diretório %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista de extensão de fontes é muito extensa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Erro processando conteúdo %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1892,26 +1892,26 @@ msgstr ""
" -c=? Lê o arquivo de configuração especificado.\n"
" -o=? Define uma opção de configuração arbitrária"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nenhuma seleção combinou"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "BD estava corrompido, arquivo renomeado para %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "BD é antigo, tentando atualizar %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1920,27 +1920,22 @@ msgstr ""
"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
"apt, por favor, remova e recrie o banco de dados."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Impossível abrir o arquivo BD %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Falhou ao executar \"stat\" %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou ao executar \"readlink\" %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Repositório não possui registro de controle"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
@@ -2005,26 +2000,26 @@ msgstr "*** Falhou ao ligar %s a %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -3459,61 +3454,61 @@ msgstr "Preparando para remover completamente %s"
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Impossível escrever para %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 6b3ef13d0..4a72efa95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -300,78 +300,78 @@ msgstr ""
" -c=? Citește acest fișier de configurare\n"
" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -379,97 +379,97 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,7 +478,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -487,14 +487,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +503,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,30 +512,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Conectare la %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -673,7 +673,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -1173,7 +1173,7 @@ msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.
msgid "You don't have enough free space in %s."
msgstr "Nu aveți suficient spațiu în %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
@@ -1353,23 +1353,23 @@ msgstr "Pachete sugerate:"
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Avertisment de autentificare înlocuit.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Unele pachete n-au putut fi autentificate"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Instalați aceste pachete fără verificare?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -1788,31 +1788,31 @@ msgstr "Nu s-a putut scrie în %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Lista de extensii pentru pachet este prea lungă"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Eroare la prelucrarea directorului %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Lista de extensii pentru sursă este prea lungă"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Eroare la scrierea antetului în fișierul index"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Eroare la prelucrarea conținutului %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1900,26 +1900,26 @@ msgstr ""
" -c=? Citește acest fișier de configurare\n"
" -o=? Ajustează o opțiune de configurare arbitrară"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nu s-a potrivit nici o selecție"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB este vechi, se încearcă înnoirea %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1928,27 +1928,22 @@ msgstr ""
"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
"veche, ștergeți și recreați baza de date."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nu s-a putut deschide fișierul DB %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Eșec la „stat” pentru %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Eșec la „readlink” pentru %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arhiva nu are înregistrare de control"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
@@ -2013,26 +2008,26 @@ msgstr "*** Eșec la „link” între %s și %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -3465,61 +3460,61 @@ msgstr "Se pregătește ștergerea completă a %s"
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Nu s-a putut scrie în %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 7d62a48ba..a1b1c8414 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -164,9 +164,9 @@ msgid " Version table:"
msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -300,47 +300,47 @@ msgstr ""
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Игнорируется недоступная версия «%s» пакета «%s»"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s установлен вручную.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s выбран для автоматической установки.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -348,25 +348,25 @@ msgstr ""
"Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark "
"manual»."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходным кодом для %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -386,80 +386,80 @@ msgstr ""
"bzr branch %s\n"
"для получения последних (возможно не выпущенных) обновлений пакета.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл «%s»\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо получить %sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение исходного кода %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Указан режим «только скачивание», и скачивание завершено"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -468,17 +468,17 @@ msgstr ""
"У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +487,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
"разрешён для пакетов «%s»"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +496,14 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog для %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -686,7 +686,7 @@ msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -1212,7 +1212,7 @@ msgstr ""
msgid "You don't have enough free space in %s."
msgstr "Недостаточно свободного места в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
@@ -1391,23 +1391,23 @@ msgstr "Предлагаемые пакеты:"
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Предупреждение об аутентификации не принято в внимание.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Некоторые пакеты невозможно аутентифицировать"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Установить эти пакеты без проверки?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
@@ -1831,32 +1831,32 @@ msgstr "Невозможно записать в %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Невозможно определить версию debconf. Он установлен?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Список расширений, допустимых для пакетов, слишком длинен"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Ошибка обработки каталога %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Список расширений источников слишком длинен"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr ""
"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1942,26 +1942,26 @@ msgstr ""
" -c=? Использовать указанный файл настройки\n"
" -o=? Задать значение произвольному параметру настройки"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Совпадений не обнаружено"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "БД была повреждена, файл переименован в %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB устарела, попытка обновить %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1969,27 +1969,22 @@ msgstr ""
"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
"и создайте базу данных заново."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Не удалось открыть DB файл %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Не удалось получить атрибуты %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Не удалось прочесть ссылку %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "В архиве нет поля control"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
@@ -2054,26 +2049,26 @@ msgstr "*** Не удалось создать ссылку %s на %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -3531,37 +3526,37 @@ msgstr "Подготовка к полному удалению %s"
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Невозможно записать в %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Действие прервано до его завершения"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "проблемы с зависимостями — оставляем ненастроенным"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3569,7 +3564,7 @@ msgstr ""
"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
"повторную ошибку от предыдущего отказа."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3577,7 +3572,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3585,7 +3580,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"памяти"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3594,7 +3589,7 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"места на диске"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index c9e4de04c..ef62731fe 100644
--- a/po/sk.po
+++ b/po/sk.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Tabuľka verzií:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -296,47 +296,47 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je označený ako manuálne nainštalovaný.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s je označený ako automaticky nainštalovaný.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -344,24 +344,24 @@ msgstr ""
"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a "
"„apt-mark manual“."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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 ""
"adrese:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -383,80 +383,80 @@ msgstr ""
"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
"balíka.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,17 +465,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,20 +484,20 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
"„%s“"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -506,7 +506,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,30 +514,30 @@ msgid ""
msgstr ""
"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s nemožno splniť."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Záznam zmien %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -674,7 +674,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -1187,7 +1187,7 @@ msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
@@ -1367,23 +1367,23 @@ msgstr "Navrhované balíky:"
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Nainštalovať tieto nekontrolované balíky?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -1803,31 +1803,31 @@ msgstr "Do %s sa nedá zapisovať"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Zoznam rozšírení balíka je príliš dlhý"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Chyba pri spracovávaní adresára %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Chyba pri zapisovaní hlavičky do súboru"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Chyba pri spracovávaní obsahu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1907,26 +1907,26 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nevyhovel žiaden výber"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB je narušená, súbor je premenovaný na %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1934,27 +1934,22 @@ msgstr ""
"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
"odstrániť a znovu vytvoriť databázu."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nedá sa otvoriť DB súbor %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s sa nedá vyhodnotiť"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie je možné vykonať readlink %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Archív nemá riadiaci záznam"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
@@ -2019,26 +2014,26 @@ msgstr "*** Nepodarilo sa zlinkovať %s s %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -3471,37 +3466,37 @@ msgstr "Pripravuje sa úplné odstránenie %s"
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Do %s sa nedá zapisovať"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
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:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3509,7 +3504,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3517,7 +3512,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3525,7 +3520,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
"pamäte"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3534,7 +3529,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
"zaplnený"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index f71acd661..559cf2ee8 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -158,9 +158,9 @@ msgid " Version table:"
msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -294,47 +294,47 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je bil nastavljen na ročno nameščen.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s je nastavljen na samodejno nameščen.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -342,25 +342,25 @@ msgstr ""
"Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark "
"manual'."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Ni mogoče zakleniti mape prejemov"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoče najti"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -380,80 +380,80 @@ msgstr ""
"bzr branch %s\n"
"za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskok že prejete datoteke '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ni mogoče določiti prostega prostora v %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Podrejeno opravilo ni uspelo"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -462,17 +462,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -480,20 +480,20 @@ msgid ""
msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -502,7 +502,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -511,30 +511,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -671,7 +671,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -1183,7 +1183,7 @@ msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
msgid "You don't have enough free space in %s."
msgstr "Na %s je premalo prostora."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
@@ -1367,23 +1367,23 @@ msgstr "Predlagani paketi:"
msgid "Recommended packages:"
msgstr "Priporočeni paketi:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Opozorilo overitve je bilo prepisano.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Nekaterih paketkov bi bilo mogoče overiti"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Ali želite te pakete namestiti brez preverjanja?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
@@ -1805,31 +1805,31 @@ msgstr "Ni mogoče pisati na %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Seznam razširitev paketov je predolg"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Napaka med obdelavo mape %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Seznam razširitev virov je predolg"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Napaka med pisanjem glave v datoteko vsebine"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Napaka med obdelavo vsebine %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1909,26 +1909,26 @@ msgstr ""
" -c=? prebere to nastavitveno datoteko\n"
" -o=? nastavi poljubno možnost nastavitve"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Nobena izbira se ne ujema"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "PZ je star, poskušanje nadgradnje %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1936,27 +1936,22 @@ msgstr ""
"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni mogoče odprti datoteke PZ %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Napaka med določitvijo %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Napaka med branjem povezave %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arhiv nima nadzornega zapisa"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Ni mogoče najti kazalke"
@@ -2021,26 +2016,26 @@ msgstr "*** Napaka med povezovanjem %s in %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Dosežena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -3478,38 +3473,38 @@ msgstr "Pripravljanje na popolno odstranitev %s"
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni mogoče pisati na %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3517,7 +3512,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3525,7 +3520,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"polnega diska"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3533,7 +3528,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3541,7 +3536,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0fe60f77a..56b79197f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -158,9 +158,9 @@ msgid " Version table:"
msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -297,70 +297,70 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s är satt till automatiskt installerad.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren förstörde någonting"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: 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 ""
"på:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -381,95 +381,95 @@ msgstr ""
"bzr get %s\n"
"för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,7 +478,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -487,14 +487,14 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +503,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,31 +512,31 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
# Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -673,7 +673,7 @@ msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -1175,7 +1175,7 @@ msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Problem har uppstått och -y användes utan --force-yes"
@@ -1350,23 +1350,23 @@ msgstr "Föreslagna paket:"
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VARNING: Följande paket kunde inte autentiseras!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Autentiseringsvarning åsidosatt.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Några av paketen kunde inte autentiseras"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Installera dessa paket utan verifiering?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -1793,31 +1793,31 @@ msgstr "Kunde inte skriva till %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Listan över filtillägg för Packages är för lång"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Fel vid behandling av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Listan över filtillägg för Sources är för lång"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Fel vid skrivning av rubrik till innehållsfil"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Fel vid behandling av innehållet %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1898,26 +1898,26 @@ msgstr ""
" -c=? Läs denna konfigurationsfil\n"
" -o=? Ställ in en godtycklig konfigurationsflagga"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Inga val träffades"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Några filer saknas i paketfilsgruppen \"%s\""
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB var skadad, filen omdöpt till %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB är gammal, försöker uppgradera %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1925,27 +1925,22 @@ msgstr ""
"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
"från en äldre version av apt."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kunde inte öppna DB-filen %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Misslyckades med att ta status på %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Misslyckades med att läsa länken %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arkivet har ingen styrpost"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
@@ -2012,27 +2007,27 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -3474,37 +3469,37 @@ msgstr "Förbereder borttagning av hela %s"
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Kunde inte skriva till %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "beroendeproblem - lämnar okonfigurerad"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3512,7 +3507,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3520,7 +3515,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3528,7 +3523,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
"är slut"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3537,7 +3532,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
"diskutrymmet är slut"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/th.po b/po/th.po
index b2c96af3f..d5cd8d52a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -156,9 +156,9 @@ msgid " Version table:"
msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -291,70 +291,70 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "ไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน"
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -374,78 +374,78 @@ msgstr ""
"bzr branch %s\n"
"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -453,17 +453,17 @@ msgid ""
msgstr ""
"ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -471,19 +471,19 @@ msgid ""
msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, 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:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -658,7 +658,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -1162,7 +1162,7 @@ msgstr "หลังจากการกระทำนี้ เนื้อ
msgid "You don't have enough free space in %s."
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
@@ -1323,23 +1323,23 @@ msgstr "แพกเกจที่แนะนำ:"
msgid "Recommended packages:"
msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -1755,31 +1755,31 @@ msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1856,52 +1856,47 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "ไม่มีรายการเลือกที่ตรง"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "stat %s ไม่สำเร็จ"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink %s ไม่สำเร็จ"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "แพกเกจไม่มีระเบียนควบคุม"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
@@ -1966,26 +1961,26 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -3397,63 +3392,63 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/tl.po b/po/tl.po
index ae8215319..888225f3a 100644
--- a/po/tl.po
+++ b/po/tl.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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -304,77 +304,77 @@ msgstr ""
" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -382,95 +382,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +479,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +488,14 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +504,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:1356
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +513,30 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -670,7 +670,7 @@ msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1170,7 +1170,7 @@ msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
msgid "You don't have enough free space in %s."
msgstr "Kulang kayo ng libreng puwang sa %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "May mga problema at -y ay ginamit na walang --force-yes"
@@ -1335,25 +1335,25 @@ msgstr "Mga paketeng mungkahi:"
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -1771,31 +1771,31 @@ msgstr "Hindi makapagsulat sa %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Error sa pagproseso ng directory %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Error sa pagproseso ng Contents %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1880,26 +1880,26 @@ msgstr ""
" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option na pagkaayos"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Walang mga pinili na tugma"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1908,27 +1908,22 @@ msgstr ""
"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
"bersiyon ng apt, tanggalin at likhain muli ang database."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Bigo ang pag-stat ng %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Bigo ang pagbasa ng link %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Walang kontrol rekord ang arkibo"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
@@ -1993,26 +1988,26 @@ msgstr "*** Bigo ang pag-link ng %s sa %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -3446,61 +3441,61 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Hindi makapagsulat sa %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index fa6c0dc47..5e80f2746 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -160,9 +160,9 @@ msgid " Version table:"
msgstr " Sürüm çizelgesi:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -298,47 +298,47 @@ msgstr ""
" -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "'%2$s' paketinin mevcut olmayan '%1$s' sürümünü görmezden gel"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "%s paketi bulunamadı"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s elle kurulmuş olarak ayarlı.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -346,24 +346,24 @@ msgstr ""
"Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark "
"manual' kullanın."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "İç hata, sorun çözücü nesneyi bozdu"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "İndirme dizini kilitlenemiyor"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s paketinin kaynak paketi bulunamadı"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"yapılmaktadır:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -385,78 +385,78 @@ msgstr ""
"bzr branch %s\n"
"komutunu kullanın.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s içindeki boş alan miktarı belirlenemedi"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB kaynak arşivi indirilecek.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "%s kaynağını al\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Bazı arşivler alınamadı."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Paket açma komutu '%s' başarısız.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "İnşa komutu '%s' başarısız oldu.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Alt süreç başarısız"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,17 +465,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,7 +484,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -492,12 +492,12 @@ msgid ""
msgstr ""
"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı."
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -506,7 +506,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,30 +514,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
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:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "%s (%s) paketinin değişim günlüğü"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Desteklenen birimler:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -676,7 +676,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s için beklenildi ama o gelmedi"
@@ -1189,7 +1189,7 @@ msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n"
msgid "You don't have enough free space in %s."
msgstr "%s içinde yeterli boş alanınız yok."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
@@ -1363,23 +1363,23 @@ msgstr "Önerilen paketler:"
msgid "Recommended packages:"
msgstr "Tavsiye edilen paketler:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Paketler doğrulanmadan kurulsun mu?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s ağdan alınamadı. %s\n"
@@ -1803,31 +1803,31 @@ msgstr "%s dosyasına yazılamıyor"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Paket uzantı listesi çok uzun"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "%s dizinini işlemede hata"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Kaynak uzantı listesi çok uzun"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "İçindekiler dosyasına üstbilgi yazmada hata"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "%s içeriğini işlemede hata"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1910,26 +1910,26 @@ msgstr ""
" -c=? Belirtilen yapılandırma dosyası kullan\n"
" -o=? Yapılandırma seçeneği ayarla"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Hiçbir seçim eşleşmedi"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1937,27 +1937,22 @@ msgstr ""
"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme "
"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Veritabanı dosyası %s açılamadı: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "%s durum bilgisi alınamadı"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s bağlantı okuması başarılamadı"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Arşivin denetim kaydı yok"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "İmleç alınamıyor"
@@ -2022,26 +2017,26 @@ msgstr "*** %s, %s konumuna bağlanamadı"
msgid " DeLink limit of %sB hit.\n"
msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Arşivde paket alanı yok"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s için geçersiz kılma girdisi yok\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s geliştiricisi %s, %s değil\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n"
@@ -3492,38 +3487,38 @@ msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
msgid "Completely removed %s"
msgstr "%s tamamen kaldırıldı"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "%s dosyasına yazılamıyor"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "İşlem yarıda kesildi"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
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:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3531,14 +3526,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3546,7 +3541,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3554,7 +3549,7 @@ msgid ""
msgstr ""
"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index c0c01df53..013d1a85b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -165,9 +165,9 @@ msgid " Version table:"
msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -300,47 +300,47 @@ msgstr ""
" -с=? Читати зазначений конфігураційний файл.\n"
" -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s позначений як встановлений вручну.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s позначений як автоматично встановлений.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -348,26 +348,26 @@ msgstr ""
"Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' "
"і 'apt-mark manual'."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем щось поламав"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати директорію для завантаження"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +376,7 @@ msgstr ""
"УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -387,81 +387,81 @@ msgstr ""
"bzr branch %s\n"
"щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Завантаження завершено в режимі \"тільки завантаження\""
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -470,17 +470,17 @@ msgstr ""
"Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
"Архітектури для налащтування"
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +489,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
"'%s' пакунках"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +497,14 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1304
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s "
"новіше, аніж треба"
-#: cmdline/apt-get.cc:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +513,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
"кандидата %s не задовольняє умови по версіям"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +522,30 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
"кандидата %s потрібної версії"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Журнал змін для %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -688,7 +688,7 @@ msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "You don't have enough free space in %s."
msgstr "Недостатньо вільного місця в %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
@@ -1386,23 +1386,23 @@ msgstr "Пропоновані пакунки:"
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Деякі пакунки неможливо автентифікувати"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Встановити ці пакунки без перевірки?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -1826,33 +1826,33 @@ msgstr "Неможливо записати в %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Неможливо визначити версію debconf. Він встановлений?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Список розширень, припустимих для пакунків, занадто довгий"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Помилка обробки директорії %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr ""
"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
"довгий"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1940,26 +1940,26 @@ msgstr ""
" -c=? Використати зазначений конфігураційний файл\n"
" -o=? Вказати довільний параметр конфігурації"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Збігів не виявлено"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "У групі пакунків '%s' відсутні деякі файли"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "БД була пошкоджена, файл перейменований на %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "БД застаріла, намагаюсь оновити %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1967,27 +1967,22 @@ msgstr ""
"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
"видаліть і наново створіть базу-даних."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Не вдалося відкрити файл БД %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Не вдалося одержати атрибути %s"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Не вдалося прочитати посилання (readlink) %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "В архіві немає запису 'control'"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
@@ -2052,26 +2047,26 @@ msgstr "*** Не вдалося створити посилання %s на %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Перевищено ліміт в %sB в DeLink.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -3527,39 +3522,39 @@ msgstr "Підготовка до повного видалення %s"
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Неможливо записати в %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr "Операцію було перервано до того, як вона мала завершитися"
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "проблеми з залежностями - залишено неналаштованим"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3567,7 +3562,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
"що ця помилка є наслідком попередньої невдачі."
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3575,7 +3570,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3583,7 +3578,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця у пам'яті"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
@@ -3592,7 +3587,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця на диску"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 64c178cc7..ece39dcf8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.16.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2014-03-28 14:49+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -162,9 +162,9 @@ msgid " Version table:"
msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -308,47 +308,47 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Không tìm thấy gói cho kiến trúc “%s”"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Không tìm thấy gói “%s” với phiên bản “%s”"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Không tìm thấy gói “%s” với số phát hành “%s”"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Không tìm thấy phiên bản “%s” của gói “%s”"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s được đặt thành “được cài đặt bằng tay”.\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s được đặt thành “được tự động cài đặt”.\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -356,24 +356,24 @@ msgstr ""
"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark auto” và “apt-mark manual” "
"để thay thế."
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Không thể khoá thư mục tải về"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
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:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, 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:785
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -383,7 +383,7 @@ msgstr ""
"“%s” tại:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -394,79 +394,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:842
+#: cmdline/apt-get.cc:839
#, 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:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, 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:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, 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:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy mã nguồn %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Gặp lỗi khi lấy một số kho."
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
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:949
+#: cmdline/apt-get.cc:942
#, 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:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, 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:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh biên dịch “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
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:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -475,17 +475,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:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1100
+#: cmdline/apt-get.cc:1093
#, 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:1270
+#: cmdline/apt-get.cc:1263
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +494,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:1288
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -502,14 +502,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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -518,7 +518,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:1356
+#: cmdline/apt-get.cc:1349
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -527,30 +527,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:1379
+#: cmdline/apt-get.cc:1372
#, 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:1394
+#: cmdline/apt-get.cc:1387
#, 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:1399
+#: cmdline/apt-get.cc:1392
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:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog cho %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "Hỗ trợ các mô-đun:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -701,7 +701,7 @@ msgstr "%s đã sẵn được đặt là không giữ lại.\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Cần %s nhưng mà không thấy nó ở đây"
@@ -1244,7 +1244,7 @@ msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.
msgid "You don't have enough free space in %s."
msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”"
@@ -1411,23 +1411,23 @@ msgstr "Các gói đề nghị:"
msgid "Recommended packages:"
msgstr "Gói khuyến khích:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "CẢNH BÁO: Không thể xác thực những gói theo đây!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "Cảnh báo xác thực bị đè.\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "Một số gói không thể được xác thực"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "Cài đặt những gói này mà không cần thẩm tra?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Gặp lỗi khi lấy về %s %s\n"
@@ -1845,31 +1845,31 @@ msgstr "Không thể ghi vào %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Danh sách mở rộng gói quá dài"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "Gặp lỗi khi xử lý thư mục %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Danh sách mở rộng nguồn quá dài"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "Gặp lỗi khi xử lý nội dung %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1965,26 +1965,26 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Không có cái được chọn khớp được"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”."
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)."
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -1992,27 +1992,22 @@ msgstr ""
"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Việc lấy thông tin thống kê cho %s bị lỗi"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Gặp lỗi khi đọc liên kết %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Kho không có mục ghi điều khiển"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Không thể lấy con trỏ"
@@ -2077,26 +2072,26 @@ msgstr "*** Gặp lỗi khi liên kết %s đến %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè (override)\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè (override) nguồn\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè (override) nhị phân\n"
@@ -3549,38 +3544,38 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
msgid "Completely removed %s"
msgstr "Gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, c-format
msgid "Can not write log (%s)"
msgstr "Không thể ghi nhật ký (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr "/dev/pts đã gắn chưa?"
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr "Đầu ra là thiết bị cuối?"
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
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:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Không ghi báo cáo apport, vì đã chạm 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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
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:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3588,14 +3583,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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
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:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
@@ -3603,7 +3598,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:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
@@ -3611,7 +3606,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:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
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 efc3c2e49..8393ae68a 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\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"
@@ -157,9 +157,9 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -296,70 +296,70 @@ msgstr ""
" -c=? 读取指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:785
+#: 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 ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:787
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -379,114 +379,114 @@ msgstr ""
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -495,37 +495,37 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -662,7 +662,7 @@ msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1150,7 +1150,7 @@ msgstr "解压缩后将会空出 %sB 的空间。\n"
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
@@ -1308,23 +1308,23 @@ msgstr "建议安装的软件包:"
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "不经验证就安装这些软件包吗?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -1739,31 +1739,31 @@ msgstr "无法写入 %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "软件包的扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "源扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "将头写入到目录文件时出错"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1843,53 +1843,48 @@ msgstr ""
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "数据库已过期,现尝试进行升级 %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "无法读取符号链接 %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "无法获得游标"
@@ -1954,26 +1949,26 @@ msgstr "*** 无法将 %s 链接到 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -3387,62 +3382,62 @@ msgstr "正在准备完全删除 %s"
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "无法写入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
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:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
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:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
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 2864bce5e..12906ba7e 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-06-18 11:10+0200\n"
+"POT-Creation-Date: 2014-04-10 14:25+0200\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -158,9 +158,9 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1588 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:42
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
#: cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -297,77 +297,77 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,問題排除器造成了損壞"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:726
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:785
+#: 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:790
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
@@ -375,114 +375,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
-#: cmdline/apt-get.cc:868 cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:874
#, 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:890
+#: cmdline/apt-get.cc:883
#, 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:895
+#: cmdline/apt-get.cc:888
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:901
+#: cmdline/apt-get.cc:894
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:924 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開,因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:962
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1021
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1077 cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:1270
+#: cmdline/apt-get.cc:1263
#, 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:1288
+#: cmdline/apt-get.cc:1281
#, 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:1311
+#: cmdline/apt-get.cc:1304
#, 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:1350
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -490,37 +490,37 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係,因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1349
#, 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:1379
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s:%3$s"
-#: cmdline/apt-get.cc:1394
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:1492 cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: cmdline/apt-get.cc:1593
+#: cmdline/apt-get.cc:1586
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:1634
+#: cmdline/apt-get.cc:1627
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -655,7 +655,7 @@ msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/deb/dpkgpm.cc:1201
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -1143,7 +1143,7 @@ msgstr "此操作完成之後,會空出 %sB 的磁碟空間。\n"
msgid "You don't have enough free space in %s."
msgstr "在 %s 裡沒有足夠的的未使用空間。"
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
msgid "There are problems and -y was used without --force-yes"
msgstr "發生了問題,且 -y 並沒有和 --force-yes 搭配使用"
@@ -1308,23 +1308,23 @@ msgstr "建議套件:"
msgid "Recommended packages:"
msgstr "推薦套件:"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:31
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:無法驗證下列套件!"
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr "忽略了驗證警告。\n"
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
msgid "Some packages could not be authenticated"
msgstr "有部份套件無法驗證"
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr "是否不經驗證就安裝這些套件?"
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
@@ -1739,31 +1739,31 @@ msgstr "無法寫入 %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "無法取得 debconf 版本。是否有安裝 debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "套件延伸列表過長"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, c-format
msgid "Error processing directory %s"
msgstr "處理目錄 %s 時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "原始碼的延伸列表太長"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "寫入標頭資訊到內容檔時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:418
#, c-format
msgid "Error processing contents %s"
msgstr "處理內容 %s 時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:606
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1841,26 +1841,26 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項"
-#: ftparchive/apt-ftparchive.cc:841
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "找不到符合的選項"
-#: ftparchive/apt-ftparchive.cc:919
+#: ftparchive/apt-ftparchive.cc:890
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "套件檔案組 `%s' 少了部份檔案"
-#: ftparchive/cachedb.cc:52
+#: ftparchive/cachedb.cc:51
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB 已損毀,檔案被更名為 %s.old"
-#: ftparchive/cachedb.cc:70
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB 過舊,嘗試升級 %s"
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:80
#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
@@ -1868,27 +1868,22 @@ msgid ""
msgstr ""
"資料庫格式不正確。如果您是由舊版的 apt 升級上來的,請移除並重新建立資料庫。"
-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "無法開啟 DB 檔 %s: %s"
-#: ftparchive/cachedb.cc:169 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "無法取得 %s 的狀態"
-#: ftparchive/cachedb.cc:319
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "無法讀取連結 %s"
-
-#: ftparchive/cachedb.cc:352
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "套件檔沒有 control 記錄"
-#: ftparchive/cachedb.cc:581
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
@@ -1953,26 +1948,26 @@ msgstr "*** 無法將 %s 連結到 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -3376,61 +3371,61 @@ msgstr "正在準備完整移除 %s"
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "無法寫入 %s"
-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1568
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1637
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1643
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1650
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1684
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/test/integration/cachedb-lp1274466-old-format.db b/test/integration/cachedb-lp1274466-old-format.db
deleted file mode 100644
index 88da5f1ee..000000000
--- a/test/integration/cachedb-lp1274466-old-format.db
+++ /dev/null
Binary files differ
diff --git a/test/integration/deb-lp1274466-cachedb.deb b/test/integration/deb-lp1274466-cachedb.deb
deleted file mode 100644
index 43d7ee6f1..000000000
--- a/test/integration/deb-lp1274466-cachedb.deb
+++ /dev/null
Binary files differ
diff --git a/test/integration/framework b/test/integration/framework
index 4f0a69994..3b900a960 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -36,7 +36,7 @@ msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}"; }
msgtest() {
while [ -n "$1" ]; do
echo -n "${CINFO}$1${CCMD} "
- echo -n "$(echo "$2" | sed -e 's#^apt\([cgfs]\)#apt-\1#')${CINFO} "
+ echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} "
shift
if [ -n "$1" ]; then shift; else break; fi
done
@@ -114,7 +114,6 @@ aptget() { runapt apt-get "$@"; }
aptftparchive() { runapt apt-ftparchive "$@"; }
aptkey() { runapt apt-key "$@"; }
aptmark() { runapt apt-mark "$@"; }
-aptsortpkgs() { runapt apt-sortpkgs "$@"; }
apt() { runapt apt "$@"; }
apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; }
aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; }
@@ -129,10 +128,7 @@ dpkgcheckbuilddeps() {
}
gdb() {
echo "gdb: run »$*«"
- CMD="$1"
- shift
-
- APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} command gdb ${BUILDDIRECTORY}/$CMD --args ${BUILDDIRECTORY}/$CMD "$@"
+ APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} command gdb ${BUILDDIRECTORY}/$1 --args "$@"
}
gpg() {
# see apt-key for the whole trickery. Setup is done in setupenvironment
diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
deleted file mode 100755
index 147272a2c..000000000
--- a/test/integration/test-apt-ftparchive-cachedb
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-set -e
-
-ensure_correct_packages_file() {
- testequal "Package: foo
-Priority: optional
-Section: others
-Installed-Size: 29
-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: i386
-Version: 1
-Filename: pool/main/foo_1_i386.deb" head -n8 ./aptarchive/dists/test/main/binary-i386/Packages
-}
-
-ensure_correct_contents_file() {
- testequal "usr/bin/foo-i386 others/foo
-usr/share/doc/foo/FEATURES others/foo
-usr/share/doc/foo/changelog others/foo
-usr/share/doc/foo/copyright others/foo" cat ./aptarchive/dists/test/Contents-i386
-}
-
-#
-# main()
-#
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-setupenvironment
-configarchitecture "i386"
-
-mkdir -p aptarchive/dists/test/main/i18n/
-mkdir -p aptarchive/dists/test/main/source/
-mkdir -p aptarchive/dists/test/main/binary-i386
-mkdir -p aptarchive/pool/main
-
-mkdir aptarchive-overrides
-mkdir aptarchive-cache
-cat > ftparchive.conf <<"EOF"
-Dir {
- ArchiveDir "./aptarchive";
- OverrideDir "./aptarchive-overrides";
- CacheDir "./aptarchive-cache";
-};
-
-Default {
- Packages::Compress ". gzip bzip2";
- Contents::Compress ". gzip bzip2";
- LongDescription "false";
-};
-
-TreeDefault {
- BinCacheDB "packages-$(SECTION)-$(ARCH).db";
-
- Directory "pool/$(SECTION)";
- SrcDirectory "pool/$(SECTION)";
-
- Packages "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages";
- Contents "$(DIST)/Contents-$(ARCH)";
-};
-
-Tree "dists/test" {
- Sections "main";
- Architectures "i386";
-
-};
-EOF
-
-# build one pacakge
-buildsimplenativepackage 'foo' 'i386' '1' 'test'
-mv incoming/* aptarchive/pool/main/
-
-# generate (empty cachedb)
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-ensure_correct_packages_file
-ensure_correct_contents_file
-testequal " Misses in Cache: 2
- dists/test/Contents-i386: New 402 B Misses in Cache: 0" grep Misses stats-out.txt
-
-# generate again
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-ensure_correct_packages_file
-ensure_correct_contents_file
-testequal " Misses in Cache: 0
- dists/test/Contents-i386: Misses in Cache: 0" grep Misses stats-out.txt
-
-# and again (with removing the Packages file)
-rm -f ./aptarchive/dists/test/main/binary-i386/*
-rm -f ./aptarchive/dists/test/Contents-i386
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-ensure_correct_packages_file
-ensure_correct_contents_file
-testequal " Misses in Cache: 0
- dists/test/Contents-i386: New 402 B Misses in Cache: 0" grep Misses stats-out.txt
-
-# and clean
-rm -rf aptarchive/pool/main/*
-testequal "packages-main-i386.db" aptftparchive clean ftparchive.conf
-aptftparchive clean ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 > clean-out.txt 2>&1
-testequal "0 Number of unique keys in the tree" grep unique clean-out.txt
-testequal "packages-main-i386.db" grep packages-main-i386.db clean-out.txt
-
diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466
deleted file mode 100755
index f26a19d83..000000000
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-set -e
-
-
-#
-# main()
-#
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-setupenvironment
-configarchitecture "i386"
-
-# gather the db and the deb, ensure mtime is not modfied as its saved in the DB
-cp -p $TESTDIR/deb-lp1274466-cachedb.deb foo_1_i386.deb
-cp $TESTDIR/cachedb-lp1274466-old-format.db old-format.db
-
-# verify that the format is different
-testsuccess aptftparchive --db new-format.db packages .
-db_dump new-format.db > new-format.dump
-db_dump old-format.db > old-format.dump
-testfailure diff -u old-format.dump new-format.dump
-
-# ensure the new format as the sha512
-testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c new-format.dump
-# but the old format does not
-testfailure grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
-
-# regression test for corruption with previous generation of cachedb
-testequal "Package: foo
-Priority: optional
-Section: others
-Installed-Size: 29
-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: i386
-Version: 1
-Filename: ./foo_1_i386.deb
-Size: 1270
-MD5sum: 85d0e908c1a897700e2c5dea72d7e3c0
-SHA1: 858b09169032b7925a0e463f46b6634243fc40ce
-SHA256: 3750a2c9c6b5beee7f307564be3d51d3ec7cbb78fa4f0b47f84a7c41477bff59
-SHA512: 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c
-Description: an autogenerated dummy foo=1/test
- If you find such a package installed on your system,
- something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…
-" aptftparchive --db old-format.db packages .
-
-# ensure that the db is updated
-db_dump old-format.db > old-format.dump
-testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb
deleted file mode 100755
index adcca6217..000000000
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/sh
-set -e
-
-assert_correct_sources_file() {
- testequal "Package: bar
-Architecture: all
-Version: 1.0
-Binary: bar
-Format: 3.0 (native)
-Directory: pool/main
-Files:
- 7b57dd065e51de5905288a5104d4bef5 406 bar_1.0.dsc
- d41d8cd98f00b204e9800998ecf8427e 0 bar_1.0.tar.gz
-Package-List:
- bar deb admin extra
-Checksums-Sha1:
- 17a40b76715f393ab7fd6485c9392a02f1adf903 406 bar_1.0.dsc
- da39a3ee5e6b4b0d3255bfef95601890afd80709 0 bar_1.0.tar.gz
-Checksums-Sha256:
- d9d7507f66a89258b6920aca47747d7a30e0e64b09ecabbf02b2efbdabf840a9 406 bar_1.0.dsc
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 bar_1.0.tar.gz
-Checksums-Sha512:
- ee0a9bfb6614159b45203fc29487d4f37387993ca0e6d6f27b80010498f3731d75753188ece307508ae9af0259bd11a6af15a1a38f0b87dbd5ea1273b7a7d53e 406 bar_1.0.dsc
- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e 0 bar_1.0.tar.gz
-
-Package: foo
-Architecture: all
-Version: 1.0
-Binary: foo
-Format: 3.0 (native)
-Directory: pool/main
-Files:
- d144826e6f02831c1933e910c92cd7e0 171 foo_1.0.dsc
- d41d8cd98f00b204e9800998ecf8427e 0 foo_1.0.tar.gz
-Package-List:
- foo deb admin extra
-Checksums-Sha1:
- 979306aa3ccff3d61bba062bb6977e2493c6f907 171 foo_1.0.dsc
- da39a3ee5e6b4b0d3255bfef95601890afd80709 0 foo_1.0.tar.gz
-Checksums-Sha256:
- 8c780af8b5a6d5b3c2e2f9518940beebea52ac6d6ad7b52c082dc925cfe5b532 171 foo_1.0.dsc
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 foo_1.0.tar.gz
-Checksums-Sha512:
- 3da0240fd764657c2f3661b4d750578a9a99b0580591b133756379d48117ebda87a5ed2467f513200d6e7eaf51422cbe91c15720eef7fb4bba2cc8ff81ebc547 171 foo_1.0.dsc
- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e 0 foo_1.0.tar.gz
-" aptsortpkgs ./aptarchive/dists/test/main/source/Sources
-}
-
-create_source_files() {
- NAME="$1"
- REQUEST_CLEARSIGN="$2"
-
- TARFILE="aptarchive/pool/main/${NAME}_1.0.tar.gz"
- DSC_FILE="aptarchive/pool/main/${NAME}_1.0.dsc"
- touch $TARFILE
- if [ "$REQUEST_CLEARSIGN" = "CLEARSIGN" ]; then
- printf -- "-----BEGIN PGP SIGNED MESSAGE-----\n\n" > $DSC_FILE
- fi
- cat >> $DSC_FILE << EOF
-Format: 3.0 (native)
-Source: $NAME
-Binary: $NAME
-Architecture: all
-Version: 1.0
-Package-List:
- $NAME deb admin extra
-Files:
- $(md5sum $TARFILE|cut -f1 -d' ') $(stat --print="%s" $TARFILE) ${NAME}_1.0.tar.gz
-EOF
- if [ "$REQUEST_CLEARSIGN" = "CLEARSIGN" ]; then
- cat >> $DSC_FILE <<EOF
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEARECAAYFAk3k/VoACgkQliSD4VZixzQxlgCgpav7j68z48qNTDFuT9fLqwT5
-DFwAoIXatJFENEC371bMKTkUKlwZxQEk
-=iI9V
------END PGP SIGNATURE-----
-EOF
- fi
-}
-
-create_clearsigned_source_files() {
- NAME="$1"
- create_source_files "$NAME" "CLEARSIGN"
-}
-
-#
-# main()
-#
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-setupenvironment
-configarchitecture "i386"
-
-msgtest 'Test apt-ftparchive source with missing hashes in .dsc'
-
-mkdir -p aptarchive/pool/main
-create_source_files foo
-create_clearsigned_source_files bar
-
-mkdir -p aptarchive/dists/test/main/i18n/
-mkdir -p aptarchive/dists/test/main/source/
-
-mkdir aptarchive-overrides
-mkdir aptarchive-cache
-
-
-
-# generate with --db option
-(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
- -o APT::FTPArchive::ShowCacheMisses=1 \
- > dists/test/main/source/Sources \
- 2> stats-out.txt
- testequal " Misses in Cache: 2" grep Misses stats-out.txt
-)
-assert_correct_sources_file
-
-# generate with --db option (again to ensure its in the cache)
-(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
- -o APT::FTPArchive::ShowCacheMisses=1 \
- > dists/test/main/source/Sources \
- 2> stats-out.txt
- testequal " Misses in Cache: 0" grep Misses stats-out.txt
-)
-assert_correct_sources_file
-
-
-
-# get ready for the "apt-ftparchive generate" command
-cat > apt-ftparchive.conf <<"EOF"
-Dir {
- ArchiveDir "./aptarchive";
- OverrideDir "./aptarchive-overrides";
- CacheDir "./aptarchive-cache";
-};
-
-Default {
- Packages::Compress ". gzip bzip2";
- Contents::Compress ". gzip bzip2";
- LongDescription "false";
-};
-
-TreeDefault {
- BinCacheDB "packages-$(SECTION)-$(ARCH).db";
- SrcCacheDB "sources-$(SECTION).db";
-
- Directory "pool/$(SECTION)";
- SrcDirectory "pool/$(SECTION)";
-
- Sources "$(DIST)/$(SECTION)/source/Sources";
-};
-
-Tree "dists/test" {
- Sections "main";
- Architectures "source";
-
-};
-EOF
-
-# generate (empty cachedb)
-aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-testequal " Misses in Cache: 2" grep Misses stats-out.txt
-assert_correct_sources_file
-
-
-# generate again out of the cache
-rm -f ./aptarchive/dists/test/main/source/Sources
-aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-testequal " Misses in Cache: 0" grep Misses stats-out.txt
-assert_correct_sources_file
-
-
-
-# generate invalid files
-mkdir aptarchive/pool/invalid
-printf "meep" > aptarchive/pool/invalid/invalid_1.0.dsc
-testequal "
-E: Could not find a Source entry in the DSC 'aptarchive/pool/invalid/invalid_1.0.dsc'" aptftparchive sources aptarchive/pool/invalid
-rm -f aptarchive/pool/invalid/invalid_1.0.dsc
-
-dd if=/dev/zero of="aptarchive/pool/invalid/toobig_1.0.dsc" bs=1k count=129 2>/dev/null
-testequal "
-E: DSC file 'aptarchive/pool/invalid/toobig_1.0.dsc' is too large!" aptftparchive sources aptarchive/pool/invalid
-
-# ensure clean works
-rm -f aptarchive/pool/main/*
-aptftparchive clean apt-ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 > clean-out.txt 2>&1
-testequal "0 Number of unique keys in the tree" grep unique clean-out.txt
-testequal "sources-main.db" grep sources-main.db clean-out.txt
-
-
diff --git a/test/integration/test-apt-http-overflow b/test/integration/test-apt-http-overflow
new file mode 100755
index 000000000..b58b79cf4
--- /dev/null
+++ b/test/integration/test-apt-http-overflow
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Ensure we do not crash on long urls
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "amd64"
+configcompression '.' 'gz'
+
+insertpackage 'unstable' 'foo' 'all' '1.0'
+
+setupaptarchive --no-update
+changetowebserver
+
+rm -f rootdir/var/cache/apt/*.bin
+sed -i 's#Filename: pool/main/foo/foo_1.0_all.deb#Filename: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#' \
+ aptarchive/dists/unstable/main/binary-amd64/Packages
+gzip -c aptarchive/dists/unstable/main/binary-amd64/Packages > \
+ aptarchive/dists/unstable/main/binary-amd64/Packages.gz
+bzip2 -c aptarchive/dists/unstable/main/binary-amd64/Packages > \
+ aptarchive/dists/unstable/main/binary-amd64/Packages.bz2
+
+generatereleasefiles
+signreleasefiles
+
+testsuccess aptget update
+msgmsg "Ensure http does not segfault"
+
+aptget install foo -qq 2> output.log || true
+grep -q 'Unable to fetch some archives, ' output.log && msgpass || msgfail
+
diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
new file mode 100755
index 000000000..fbcd473cc
--- /dev/null
+++ b/test/integration/test-apt-update-file
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Ensure that we do not modify file:/// uris (regression test for
+# CVE-2014-0487
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "amd64"
+configcompression 'bz2' 'gz'
+
+insertpackage 'unstable' 'foo' 'all' '1.0'
+
+umask 022
+setupaptarchive --no-update
+
+# ensure the archive is not writable
+chmod 550 aptarchive/dists/unstable/main/binary-amd64
+
+testsuccess aptget update -qq
+testsuccess aptget update -qq
+aptget update -qq -o Debug::pkgAcquire::Auth=1 2> output.log
+
+# ensure that the hash of the uncompressed file was verified even on a local
+# ims hit
+canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"
+grep -q "RecivedHash: $canary" output.log
+
+# foo is still available
+testsuccess aptget install -s foo
+
+# the cleanup should still work
+chmod 750 aptarchive/dists/unstable/main/binary-amd64
diff --git a/test/integration/test-apt-update-stale b/test/integration/test-apt-update-stale
new file mode 100755
index 000000000..780ff79af
--- /dev/null
+++ b/test/integration/test-apt-update-stale
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Ensure that a MITM can not stale the Packages/Sources without
+# raising a error message. Note that the Release file is protected
+# via the "Valid-Until" header
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+insertpackage 'unstable' 'foo' 'all' '1.0'
+
+setupaptarchive
+changetowebserver
+aptget update -qq
+
+# insert new version
+mkdir aptarchive/dists/unstable/main/binary-i386/saved
+cp -p aptarchive/dists/unstable/main/binary-i386/Packages* \
+ aptarchive/dists/unstable/main/binary-i386/saved
+insertpackage 'unstable' 'foo' 'all' '2.0'
+
+# not using compressfile for compat with older apt releases
+gzip -c aptarchive/dists/unstable/main/binary-i386/Packages > \
+ aptarchive/dists/unstable/main/binary-i386/Packages.gz
+generatereleasefiles
+signreleasefiles
+
+# ensure that we do not get a I-M-S hit for the Release file
+touch -d "+1hour" aptarchive/dists/unstable/*Release*
+
+# but now only deliver the previous Packages file instead of the new one
+# (simulating a stale attack)
+cp -p aptarchive/dists/unstable/main/binary-i386/saved/Packages* \
+ aptarchive/dists/unstable/main/binary-i386/
+
+# ensure this raises a error
+testequal "W: Failed to fetch http://localhost:8080/dists/unstable/main/binary-i386/Packages Hash Sum mismatch
+
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
+
+
diff --git a/test/integration/test-apt-update-unauth b/test/integration/test-apt-update-unauth
new file mode 100755
index 000000000..13487603c
--- /dev/null
+++ b/test/integration/test-apt-update-unauth
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Ensure that when going from unauthenticated to authenticated all
+# files are checked again
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+insertpackage 'unstable' 'foo' 'all' '1.0'
+insertsource 'unstable' 'foo' 'all' '1.0'
+
+setupaptarchive
+changetowebserver
+
+runtest() {
+ # start unauthenticated
+ find rootdir/var/lib/apt/lists/ -type f | xargs rm -f
+ rm -f aptarchive/dists/unstable/*Release*
+ aptget update -qq
+
+ # become authenticated
+ generatereleasefiles
+ signreleasefiles
+
+ # and ensure we do download the data again
+ msgtest "Check that the data is check when going to authenticated"
+ if aptget update |grep -q Hit; then
+ msgfail
+ else
+ msgpass
+ fi
+}
+
+for COMPRESSEDINDEXES in 'false' 'true'; do
+ echo "Acquire::GzipIndexes \"$COMPRESSEDINDEXES\";" > rootdir/etc/apt/apt.conf.d/compressindexes
+ if $COMPRESSEDINDEXES; then
+ msgmsg 'Run tests with GzipIndexes enabled'
+ else
+ msgmsg 'Run tests with GzipIndexes disabled'
+ fi
+
+ runtest
+done
diff --git a/test/integration/test-bug-747261-arch-specific-conflicts b/test/integration/test-bug-747261-arch-specific-conflicts
deleted file mode 100755
index be971b89e..000000000
--- a/test/integration/test-bug-747261-arch-specific-conflicts
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-setupenvironment
-configarchitecture 'amd64' 'sparc' 'armel'
-
-msgtest 'Check that dpkg supports' 'arch-specific dependencies'
-set +e
-# this fails always, the question is just how it fails
-dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null 2>/dev/null >/dev/null
-RETURNCODE=$?
-set -e
-if [ "$RETURNCODE" != '1' ]; then
- dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null || true
- echo "Command had returncode: $RETURNCODE"
- msgskip
- exit 0
-else
- msgpass
-fi
-
-buildsimplenativepackage 'libc6' 'amd64,sparc,armel' '1' 'stable' 'Multi-Arch: same'
-buildsimplenativepackage 'libc6-i386' 'amd64' '1' 'stable' 'Conflicts: libc6:sparc'
-
-setupaptarchive
-
-testsuccess aptget install 'libc6:amd64' 'libc6:sparc' -y
-testdpkginstalled 'libc6:amd64' 'libc6:sparc'
-testdpkgnotinstalled 'libc6-i386' 'libc6:armel'
-
-testsuccess aptget install libc6-i386 -y
-testdpkginstalled 'libc6:amd64' 'libc6-i386'
-testdpkgnotinstalled 'libc6:sparc' 'libc6:armel'
-
-testsuccess aptget install libc6:armel -y
-testdpkginstalled 'libc6:amd64' 'libc6:armel' 'libc6-i386'
-testdpkgnotinstalled 'libc6:sparc'
-
-testsuccess aptget install libc6:sparc -y
-testdpkginstalled 'libc6:amd64' 'libc6:armel' 'libc6:sparc'
-testdpkgnotinstalled 'libc6-i386'
-
-testsuccess aptget purge 'libc6:*' 'libc6-i386' -y
-testdpkgnotinstalled 'libc6:amd64' 'libc6:armel' 'libc6:sparc' 'libc6-i386'
-
-# check that (the actually simpler) single arch is fine, too
-configarchitecture 'amd64'
-testfailure aptget install libc6:sparc -s
-testsuccess aptget install libc6 libc6-i386 -y
diff --git a/test/integration/test-bug-762160-relpath b/test/integration/test-bug-762160-relpath
new file mode 100755
index 000000000..204587727
--- /dev/null
+++ b/test/integration/test-bug-762160-relpath
@@ -0,0 +1,17 @@
+#!/bin/sh
+# regresion test for bug #762160 where apt-get update fails when a
+# relative directory is given
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+insertpackage 'unstable' 'foo' 'all' '1'
+setupaptarchive
+changetowebserver
+
+testsuccess aptget update -o Dir=./rootdir
+testsuccess aptget update -o Dir=./rootdir \ No newline at end of file
diff --git a/test/integration/test-failing-maintainer-scripts b/test/integration/test-failing-maintainer-scripts
index 3dd7d643e..cb82ebc7a 100755
--- a/test/integration/test-failing-maintainer-scripts
+++ b/test/integration/test-failing-maintainer-scripts
@@ -86,7 +86,7 @@ testmyfailure() {
testfailure "$@" -o APT::Status-Fd=3
msgtest 'Test for failure message of maintainerscript in' 'console log'
local TEST='rootdir/tmp/testfailure.output'
- if grep -q 'exit status 29' "$TEST"; then
+ if grep -q 'exit status 29$' "$TEST"; then
msgpass
else
cat $TEST
diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index e77efb46e..2a400dcb4 100755
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -64,7 +64,7 @@ runtest() {
msgtest 'No package from the source available'
[ "$(aptcache show apt 2>&1)" = "E: No packages found" ] && msgpass || msgfail
msgtest 'No Packages file in /var/lib/apt/lists'
- [ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null)" = "" ] && msgpass || msgfail
+ [ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null | grep -v FAILED 2>/dev/null)" = "" ] && msgpass || msgfail
# now with the unsigned Release file
rm -rf rootdir/var/lib/apt/lists
@@ -75,5 +75,13 @@ runtest() {
}
-runtest
-
+for COMPRESSEDINDEXES in 'false' 'true'; do
+ echo "Acquire::GzipIndexes \"$COMPRESSEDINDEXES\";" > rootdir/etc/apt/apt.conf.d/compressindexes
+ if $COMPRESSEDINDEXES; then
+ msgmsg 'Run tests with GzipIndexes enabled'
+ else
+ msgmsg 'Run tests with GzipIndexes disabled'
+ fi
+
+ runtest
+done