summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-inst/contrib/extracttar.cc3
-rw-r--r--apt-inst/deb/dpkgdb.cc2
-rw-r--r--apt-inst/dirstream.cc16
-rw-r--r--apt-pkg/acquire-item.cc115
-rw-r--r--apt-pkg/acquire-item.h18
-rw-r--r--apt-pkg/acquire-worker.cc7
-rw-r--r--apt-pkg/acquire.cc14
-rw-r--r--apt-pkg/algorithms.cc91
-rw-r--r--apt-pkg/cacheiterators.h2
-rw-r--r--apt-pkg/contrib/configuration.cc26
-rw-r--r--apt-pkg/contrib/configuration.h28
-rw-r--r--apt-pkg/contrib/hashes.cc1
-rw-r--r--apt-pkg/contrib/hashes.h4
-rw-r--r--apt-pkg/contrib/md5.h1
-rw-r--r--apt-pkg/contrib/mmap.h2
-rw-r--r--apt-pkg/contrib/progress.cc4
-rw-r--r--apt-pkg/contrib/progress.h4
-rw-r--r--apt-pkg/contrib/sha256.cc424
-rw-r--r--apt-pkg/contrib/sha256.h75
-rw-r--r--apt-pkg/contrib/strutl.cc67
-rw-r--r--apt-pkg/contrib/strutl.h26
-rw-r--r--apt-pkg/deb/deblistparser.cc15
-rw-r--r--apt-pkg/deb/debmetaindex.cc2
-rw-r--r--apt-pkg/deb/debversion.cc23
-rw-r--r--apt-pkg/deb/dpkgpm.cc14
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--apt-pkg/depcache.cc502
-rw-r--r--apt-pkg/depcache.h224
-rw-r--r--apt-pkg/init.cc7
-rw-r--r--apt-pkg/init.h2
-rw-r--r--apt-pkg/makefile6
-rw-r--r--apt-pkg/packagemanager.cc15
-rw-r--r--apt-pkg/packagemanager.h32
-rw-r--r--apt-pkg/pkgcache.cc4
-rw-r--r--apt-pkg/pkgcache.h6
-rw-r--r--apt-pkg/pkgcachegen.cc20
-rw-r--r--apt-pkg/pkgcachegen.h17
-rw-r--r--apt-pkg/pkgrecords.cc5
-rw-r--r--apt-pkg/pkgrecords.h1
-rw-r--r--apt-pkg/sourcelist.cc113
-rw-r--r--apt-pkg/sourcelist.h5
-rw-r--r--apt-pkg/tagfile.cc77
-rw-r--r--apt-pkg/tagfile.h4
-rw-r--r--buildlib/archtable1
-rw-r--r--buildlib/defaults.mak17
-rw-r--r--buildlib/podomain.mak2
-rw-r--r--buildlib/sizetable1
-rw-r--r--cmdline/apt-cache.cc5
-rw-r--r--cmdline/apt-get.cc535
-rwxr-xr-xcmdline/apt-key6
-rwxr-xr-xcmdline/apt-mark63
-rw-r--r--configure.in4
-rw-r--r--debian/apt.cron.daily16
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog557
-rw-r--r--debian/compat2
-rw-r--r--debian/control5
-rw-r--r--debian/libapt-pkg-doc.doc-base.cache2
-rwxr-xr-xdebian/postinst5
-rwxr-xr-xdebian/rules12
-rw-r--r--doc/apt-cache.8.xml4
-rw-r--r--doc/apt-ftparchive.1.xml4
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt-secure.8.xml2
-rw-r--r--doc/apt.ent1
-rw-r--r--doc/examples/apt-ftparchive.conf6
-rw-r--r--doc/examples/configure-index18
-rw-r--r--doc/examples/sources.list13
-rw-r--r--doc/fr/apt-ftparchive.fr.1.xml6
-rw-r--r--doc/fr/apt-get.fr.8.xml5
-rw-r--r--doc/fr/apt-key.fr.8.xml4
-rw-r--r--doc/fr/apt.ent.fr67
-rw-r--r--doc/fr/sources.list.fr.5.xml38
-rw-r--r--doc/ja/apt-cache.ja.8.sgml638
-rw-r--r--doc/ja/apt-cache.ja.8.xml701
-rw-r--r--doc/ja/apt-cdrom.ja.8.sgml230
-rw-r--r--doc/ja/apt-cdrom.ja.8.xml255
-rw-r--r--doc/ja/apt-config.ja.8.xml165
-rw-r--r--doc/ja/apt-extracttemplates.ja.1.xml121
-rw-r--r--doc/ja/apt-ftparchive.ja.1.xml1020
-rw-r--r--doc/ja/apt-get.ja.8.sgml857
-rw-r--r--doc/ja/apt-get.ja.8.xml900
-rw-r--r--doc/ja/apt-key.ja.8.xml176
-rw-r--r--doc/ja/apt-secure.ja.8.xml374
-rw-r--r--doc/ja/apt-sortpkgs.ja.1.xml110
-rw-r--r--doc/ja/apt.conf.ja.5.sgml785
-rw-r--r--doc/ja/apt.conf.ja.5.xml809
-rw-r--r--doc/ja/apt.ent.ja411
-rw-r--r--doc/ja/apt_preferences.ja.5.xml940
-rw-r--r--doc/ja/makefile56
-rw-r--r--doc/ja/manpage.links0
-rw-r--r--doc/ja/manpage.refs4
-rw-r--r--doc/ja/sources.list.ja.5.xml427
-rw-r--r--doc/ja/style.ja.xsl9
-rw-r--r--doc/sources.list.5.xml9
-rw-r--r--ftparchive/cachedb.cc269
-rw-r--r--ftparchive/cachedb.h40
-rw-r--r--ftparchive/writer.cc104
-rw-r--r--ftparchive/writer.h8
-rw-r--r--methods/connect.cc2
-rw-r--r--methods/ftp.cc7
-rw-r--r--methods/gpgv.cc44
-rw-r--r--methods/http.cc66
-rw-r--r--methods/http.h5
-rw-r--r--methods/makefile2
-rw-r--r--po/ChangeLog281
-rw-r--r--po/LINGUAS2
-rw-r--r--po/apt-all.pot674
-rw-r--r--po/bg.po2836
-rw-r--r--po/bs.po587
-rw-r--r--po/ca.po675
-rw-r--r--po/cs.po766
-rw-r--r--po/cy.po606
-rw-r--r--po/da.po683
-rw-r--r--po/de.po625
-rw-r--r--po/dz.po2762
-rw-r--r--po/el.po757
-rw-r--r--po/en_GB.po1674
-rw-r--r--po/es.po715
-rw-r--r--po/eu.po658
-rw-r--r--po/fi.po606
-rw-r--r--po/fr.po677
-rw-r--r--po/gl.po1915
-rw-r--r--po/he.po338
-rw-r--r--po/hu.po967
-rw-r--r--po/it.po899
-rw-r--r--po/ja.po1935
-rw-r--r--po/km.po2732
-rw-r--r--po/ko.po717
-rw-r--r--po/makefile7
-rw-r--r--po/nb.po606
-rw-r--r--po/ne.po2728
-rw-r--r--po/nl.po606
-rw-r--r--po/nn.po606
-rw-r--r--po/pl.po760
-rw-r--r--po/pt.po743
-rw-r--r--po/pt_BR.po724
-rw-r--r--po/ro.po722
-rw-r--r--po/ru.po750
-rw-r--r--po/sk.po725
-rw-r--r--po/sl.po606
-rw-r--r--po/sv.po642
-rw-r--r--po/tl.po1133
-rw-r--r--po/vi.po2854
-rw-r--r--po/zh_CN.po735
-rw-r--r--po/zh_TW.po608
-rw-r--r--share/debian-archive.gpgbin1303 -> 2717 bytes
-rw-r--r--test/hash.cc7
-rw-r--r--test/testdeb.cc2
-rw-r--r--test/versions.lst7
151 files changed, 38300 insertions, 15334 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index d6da802fe..062c06fa4 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -136,7 +136,8 @@ bool ExtractTar::StartGzip()
const char *Args[3];
string confvar = string("dir::bin::") + DecompressProg;
- Args[0] = _config->Find(confvar.c_str(),DecompressProg.c_str()).c_str();
+ string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str());
+ Args[0] = argv0.c_str();
Args[1] = "-d";
Args[2] = 0;
execvp(Args[0],(char **)Args);
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index c6a0e80e6..718e1ab98 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress)
return _error->Error(_("The pkg cache must be initialized first"));
if (FList != 0)
{
- Progress.OverallProgress(1,1,1,_("Reading file list"));
+ Progress.OverallProgress(1,1,1,_("Reading file listing"));
return true;
}
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0..898ede31b 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
case Item::CharDevice:
case Item::BlockDevice:
case Item::Directory:
+ {
+ struct stat Buf;
+ // check if the dir is already there, if so return true
+ if (stat(Itm.Name,&Buf) == 0)
+ {
+ if(S_ISDIR(Buf.st_mode))
+ return true;
+ // something else is there already, return false
+ return false;
+ }
+ // nothing here, create the dir
+ if(mkdir(Itm.Name,Itm.Mode) < 0)
+ return false;
+ return true;
+ break;
+ }
case Item::FIFO:
break;
}
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index e0e0611f0..2ecb77814 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -75,7 +75,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Dequeue();
return;
}
-
+
Status = StatError;
Dequeue();
}
@@ -149,7 +149,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
if(comprExt.empty())
{
// autoselect the compression method
- if(FileExists("/usr/bin/bzip2"))
+ if(FileExists("/bin/bzip2"))
CompressionExtension = ".bz2";
else
CompressionExtension = ".gz";
@@ -184,7 +184,7 @@ string pkgAcqIndex::Custom600Headers()
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
// no .bz2 found, retry with .gz
- if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") {
+ if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {
Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
// retry with a gzip one
@@ -290,7 +290,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
else
Local = true;
- string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1);
+ string compExt = Desc.URI.substr(Desc.URI.size()-3);
char *decompProg;
if(compExt == "bz2")
decompProg = "bzip2";
@@ -344,15 +344,15 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
const vector<IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI),
- MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc)
+ MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc),
+ MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)
{
- this->MetaIndexParser = MetaIndexParser;
- this->IndexTargets = IndexTargets;
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
- // remove any partial downloaded sig-file. it may confuse proxies
- // and is too small to warrant a partial download anyway
+ // remove any partial downloaded sig-file in partial/.
+ // it may confuse proxies and is too small to warrant a
+ // partial download anyway
unlink(DestFile.c_str());
// Create the item
@@ -370,12 +370,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
// File was already in place. It needs to be re-verified
// because Release might have changed, so Move it into partial
Rename(Final,DestFile);
- // unlink the file and do not try to use I-M-S and Last-Modified
- // if the users proxy is broken
- if(_config->FindB("Acquire::BrokenProxy", false) == true) {
- std::cerr << "forcing re-get of the signature file as requested" << std::endl;
- unlink(DestFile.c_str());
- }
}
QueueURI(Desc);
@@ -425,18 +419,24 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
/*}}}*/
void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
- // Delete any existing sigfile, so that this source isn't
- // mistakenly trusted
string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
- unlink(Final.c_str());
- // if we get a timeout if fail
- if(LookupTag(Message,"FailReason") == "Timeout" ||
- LookupTag(Message,"FailReason") == "TmpResolveFailure") {
+ // if we get a network error we fail gracefully
+ if(Status == StatTransientNetworkError)
+ {
Item::Failed(Message,Cnf);
+ // move the sigfile back on network failures (and re-authenticated?)
+ if(FileExists(DestFile))
+ Rename(DestFile,Final);
+
+ // set the status back to , Item::Failed likes to reset it
+ Status = pkgAcquire::Item::StatTransientNetworkError;
return;
}
+ // Delete any existing sigfile when the acquire failed
+ unlink(Final.c_str());
+
// queue a pkgAcqMetaIndex with no sigfile
new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
"", IndexTargets, MetaIndexParser);
@@ -459,11 +459,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
string SigFile,
const vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
- Item(Owner), RealURI(URI), SigFile(SigFile)
+ Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
+ MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
{
- this->AuthPass = false;
- this->MetaIndexParser = MetaIndexParser;
- this->IndexTargets = IndexTargets;
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
@@ -555,6 +553,9 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
return;
}
+ // see if the download was a IMSHit
+ IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
+
Complete = true;
string FinalFile = _config->FindDir("Dir::State::lists");
@@ -583,7 +584,7 @@ void pkgAcqMetaIndex::AuthDone(string Message)
return;
}
- if (!VerifyVendor())
+ if (!VerifyVendor(Message))
{
return;
}
@@ -641,7 +642,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
}
}
-bool pkgAcqMetaIndex::VerifyVendor()
+bool pkgAcqMetaIndex::VerifyVendor(string Message)
{
// // Maybe this should be made available from above so we don't have
// // to read and parse it every time?
@@ -666,6 +667,22 @@ bool pkgAcqMetaIndex::VerifyVendor()
// break;
// }
// }
+ string::size_type pos;
+
+ // check for missing sigs (that where not fatal because otherwise we had
+ // bombed earlier)
+ string missingkeys;
+ string msg = _("There are no public key available for the "
+ "following key IDs:\n");
+ pos = Message.find("NO_PUBKEY ");
+ if (pos != std::string::npos)
+ {
+ string::size_type start = pos+strlen("NO_PUBKEY ");
+ string Fingerprint = Message.substr(start, Message.find("\n")-start);
+ missingkeys += (Fingerprint);
+ }
+ if(!missingkeys.empty())
+ _error->Warning("%s", string(msg+missingkeys).c_str());
string Transformed = MetaIndexParser->GetExpectedDist();
@@ -674,7 +691,7 @@ bool pkgAcqMetaIndex::VerifyVendor()
Transformed = "experimental";
}
- string::size_type pos = Transformed.rfind('/');
+ pos = Transformed.rfind('/');
if (pos != string::npos)
{
Transformed = Transformed.substr(0, pos);
@@ -720,10 +737,30 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
if (AuthPass == true)
{
- // gpgv method failed
+ // if we fail the authentication but got the file via a IMS-Hit
+ // this means that the file wasn't downloaded and that it might be
+ // just stale (server problem, proxy etc). we delete what we have
+ // queue it again without i-m-s
+ // alternatively we could just unlink the file and let the user try again
+ if (IMSHit)
+ {
+ Complete = false;
+ Local = false;
+ AuthPass = false;
+ unlink(DestFile.c_str());
+
+ DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+ DestFile += URItoFileName(RealURI);
+ Desc.URI = RealURI;
+ QueueURI(Desc);
+ return;
+ }
+
+ // gpgv method failed
_error->Warning("GPG error: %s: %s",
Desc.Description.c_str(),
LookupTag(Message,"Message").c_str());
+
}
// No Release file was present, or verification failed, so fall
@@ -799,6 +836,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
}
}
+ // "allow-unauthenticated" restores apts old fetching behaviour
+ // that means that e.g. unauthenticated file:// uris are higher
+ // priority than authenticated http:// uris
+ if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
+ Trusted = false;
+
// Select a source
if (QueueNext() == false && _error->PendingError() == false)
_error->Error(_("I wasn't able to locate file for the %s package. "
@@ -1031,13 +1074,19 @@ void pkgAcqArchive::Finished()
// ---------------------------------------------------------------------
/* The file is added to the queue */
pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
- unsigned long Size,string Dsc,string ShortDesc) :
+ unsigned long Size,string Dsc,string ShortDesc,
+ const string &DestDir, const string &DestFilename) :
Item(Owner), Md5Hash(MD5)
{
Retries = _config->FindI("Acquire::Retries",0);
- DestFile = flNotDir(URI);
-
+ if(!DestFilename.empty())
+ DestFile = DestFilename;
+ else if(!DestDir.empty())
+ DestFile = DestDir + "/" + flNotDir(URI);
+ else
+ DestFile = flNotDir(URI);
+
// Create the item
Desc.URI = URI;
Desc.Description = Dsc;
@@ -1057,7 +1106,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
else
PartialSize = Buf.st_size;
}
-
+
QueueURI(Desc);
}
/*}}}*/
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index ae2fba4d5..3a0a690e1 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -48,7 +48,8 @@ class pkgAcquire::Item
public:
// State of the item
- enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status;
+ enum {StatIdle, StatFetching, StatDone, StatError,
+ StatAuthError, StatTransientNetworkError} Status;
string ErrorText;
unsigned long FileSize;
unsigned long PartialSize;
@@ -161,8 +162,10 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
const vector<struct IndexTarget*>* IndexTargets;
indexRecords* MetaIndexParser;
bool AuthPass;
+ // required to deal gracefully with problems caused by incorrect ims hits
+ bool IMSHit;
- bool VerifyVendor();
+ bool VerifyVendor(string Message);
void RetrievalDone(string Message);
void AuthDone(string Message);
void QueueIndexes(bool verify);
@@ -234,9 +237,14 @@ class pkgAcqFile : public pkgAcquire::Item
pkgAcquire::MethodConfig *Cnf);
virtual string MD5Sum() {return Md5Hash;};
virtual string DescURI() {return Desc.URI;};
-
- pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size,
- string Desc,string ShortDesc);
+
+ // If DestFilename is empty, download to DestDir/<basename> if
+ // DestDir is non-empty, $CWD/<basename> otherwise. If
+ // DestFilename is NOT empty, DestDir is ignored and DestFilename
+ // is the absolute name to which the file should be downloaded.
+ pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size,
+ string Desc, string ShortDesc,
+ const string &DestDir="", const string &DestFilename="");
};
#endif
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index d06024178..8ab67778b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -307,6 +307,13 @@ bool pkgAcquire::Worker::RunMessages()
pkgAcquire::Item *Owner = Itm->Owner;
pkgAcquire::ItemDesc Desc = *Itm;
OwnerQ->ItemDone(Itm);
+
+ // set some status
+ if(LookupTag(Message,"FailReason") == "Timeout" ||
+ LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ConnectionRefused")
+ Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+
Owner->Failed(Message,Config);
ItemDone();
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 62209e65b..fff1b2b6a 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -266,7 +266,11 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access)
Worker Work(Conf);
if (Work.Start() == false)
return 0;
-
+
+ /* if a method uses DownloadLimit, we switch to SingleInstance mode */
+ if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0)
+ Conf->SingleInstance = true;
+
return Conf;
}
/*}}}*/
@@ -814,7 +818,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
unsigned long ETA =
(unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS);
- snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+ // only show the ETA if it makes sense
+ if (ETA > 0 && ETA < 172800 /* two days */ )
+ snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+ else
+ snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems);
+
+
// build the status str
status << "dlstatus:" << i
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 479927d65..ac9d3be0b 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -20,10 +20,12 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/version.h>
#include <apt-pkg/sptr.h>
+
#include <apti18n.h>
-
+#include <sys/types.h>
#include <iostream>
/*}}}*/
using namespace std;
@@ -220,6 +222,8 @@ void pkgSimulate::ShortBreaks()
the necessary calculations to deal with the problems. */
bool pkgApplyStatus(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
{
if (I->VersionList == 0)
@@ -230,13 +234,13 @@ bool pkgApplyStatus(pkgDepCache &Cache)
I->InstState == pkgCache::State::HoldReInstReq)
{
if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
else
{
// Is this right? Will dpkg choke on an upgrade?
if (Cache[I].CandidateVer != 0 &&
Cache[I].CandidateVerIter(Cache).Downloadable() == true)
- Cache.MarkInstall(I);
+ Cache.MarkInstall(I, false, 0, false);
else
return _error->Error(_("The package %s needs to be reinstalled, "
"but I can't find an archive for it."),I.Name());
@@ -253,12 +257,12 @@ bool pkgApplyStatus(pkgDepCache &Cache)
case pkgCache::State::HalfConfigured:
if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
I.State() != pkgCache::PkgIterator::NeedsUnpack)
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
else
{
if (Cache[I].CandidateVer != 0 &&
Cache[I].CandidateVerIter(Cache).Downloadable() == true)
- Cache.MarkInstall(I);
+ Cache.MarkInstall(I, true, 0, false);
else
Cache.MarkDelete(I);
}
@@ -284,10 +288,12 @@ bool pkgApplyStatus(pkgDepCache &Cache)
on the result. */
bool pkgFixBroken(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
// Auto upgrade all broken packages
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (Cache[I].NowBroken() == true)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* Fix packages that are in a NeedArchive state but don't have a
downloadable install version */
@@ -300,7 +306,7 @@ bool pkgFixBroken(pkgDepCache &Cache)
if (Cache[I].InstVerIter(Cache).Downloadable() == false)
continue;
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
}
pkgProblemResolver Fix(&Cache);
@@ -317,23 +323,25 @@ bool pkgFixBroken(pkgDepCache &Cache)
*/
bool pkgDistUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
/* Auto upgrade all installed packages, this provides the basis
for the installation */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (I->CurrentVer != 0)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* Now, auto upgrade all essential packages - this ensures that
the essential packages are present and working */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
- Cache.MarkInstall(I,true);
+ Cache.MarkInstall(I, true, 0, false);
/* We do it again over all previously installed packages to force
conflict resolution on them all. */
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
if (I->CurrentVer != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
pkgProblemResolver Fix(&Cache);
@@ -345,7 +353,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
if (I->SelectedState == pkgCache::State::Hold)
{
Fix.Protect(I);
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
}
}
@@ -360,6 +368,8 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
to install packages not marked for install */
bool pkgAllUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
pkgProblemResolver Fix(&Cache);
if (Cache.BrokenCount() != 0)
@@ -376,7 +386,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
continue;
if (I->CurrentVer != 0 && Cache[I].InstallVer != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
}
return Fix.ResolveByKeep();
@@ -389,6 +399,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache)
the package is restored. */
bool pkgMinimizeUpgrade(pkgDepCache &Cache)
{
+ pkgDepCache::ActionGroup group(Cache);
+
if (Cache.BrokenCount() != 0)
return false;
@@ -405,9 +417,9 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
continue;
// Keep it and see if that is OK
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache.BrokenCount() != 0)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
else
{
// If keep didnt actually do anything then there was no change..
@@ -565,6 +577,8 @@ void pkgProblemResolver::MakeScores()
installable */
bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
{
+ pkgDepCache::ActionGroup group(Cache);
+
if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false)
return false;
if ((Flags[Pkg->ID] & Protected) == Protected)
@@ -573,7 +587,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
Flags[Pkg->ID] &= ~Upgradable;
bool WasKept = Cache[Pkg].Keep();
- Cache.MarkInstall(Pkg,false);
+ Cache.MarkInstall(Pkg, false, 0, false);
// This must be a virtual package or something like that.
if (Cache[Pkg].InstVerIter(Cache).end() == true)
@@ -658,7 +672,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
if (Fail == true)
{
if (WasKept == true)
- Cache.MarkKeep(Pkg);
+ Cache.MarkKeep(Pkg, false, false);
else
Cache.MarkDelete(Pkg);
return false;
@@ -685,6 +699,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
upgrade packages to advoid problems. */
bool pkgProblemResolver::Resolve(bool BrokenFix)
{
+ pkgDepCache::ActionGroup group(Cache);
+
unsigned long Size = Cache.Head().PackageCount;
// Record which packages are marked for install
@@ -700,7 +716,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Cache[I].InstBroken() == true && BrokenFix == true)
{
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Cache[I].Install() == true)
Again = true;
}
@@ -766,14 +782,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
pkgCache::Version *OldVer = Cache[I].InstallVer;
Flags[I->ID] &= ReInstateTried;
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Cache[I].InstBroken() == true ||
OldBreaks < Cache.BrokenCount())
{
if (OldVer == 0)
Cache.MarkDelete(I);
else
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
else
if (Debug == true)
@@ -818,7 +834,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Debug == true)
clog << " Or group keep for " << I.Name() << endl;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
Change = true;
}
}
@@ -868,7 +884,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
}
Change = true;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
break;
}
@@ -905,7 +921,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
/* See if a keep will do, unless the package is protected,
then installing it will be necessary */
bool Installed = Cache[I].Install();
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache[I].InstBroken() == false)
{
// Unwind operation will be keep now
@@ -914,7 +930,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
// Restore
if (InOr == true && Installed == true)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Debug == true)
clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl;
@@ -986,7 +1002,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
// Restore
if (InOr == true && Installed == true)
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
if (Debug == true)
clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl;
@@ -1031,7 +1047,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
{
if (Debug == true)
clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl;
- Cache.MarkKeep(J->Pkg);
+ Cache.MarkKeep(J->Pkg, false, false);
}
if (Counter > 1)
@@ -1061,6 +1077,20 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
return _error->Error(_("Unable to correct problems, you have held broken packages."));
}
+ // set the auto-flags (mvo: I'm not sure if we _really_ need this, but
+ // I didn't managed
+ pkgCache::PkgIterator I = Cache.PkgBegin();
+ for (;I.end() != true; I++) {
+ if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) {
+ if(_config->FindI("Debug::pkgAutoRemove",false)) {
+ std::clog << "Resolve installed new pkg: " << I.Name()
+ << " (now marking it as auto)" << std::endl;
+ }
+ Cache[I].Flags |= pkgCache::Flag::Auto;
+ }
+ }
+
+
return true;
}
/*}}}*/
@@ -1071,6 +1101,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
system was non-broken previously. */
bool pkgProblemResolver::ResolveByKeep()
{
+ pkgDepCache::ActionGroup group(Cache);
+
unsigned long Size = Cache.Head().PackageCount;
if (Debug == true)
@@ -1104,7 +1136,7 @@ bool pkgProblemResolver::ResolveByKeep()
{
if (Debug == true)
clog << "Keeping package " << I.Name() << endl;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
if (Cache[I].InstBroken() == false)
{
K = PList - 1;
@@ -1152,7 +1184,7 @@ bool pkgProblemResolver::ResolveByKeep()
{
if (Debug == true)
clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl;
- Cache.MarkKeep(Pkg);
+ Cache.MarkKeep(Pkg, false, false);
}
if (Cache[I].InstBroken() == false)
@@ -1189,6 +1221,8 @@ bool pkgProblemResolver::ResolveByKeep()
/* This is used to make sure protected packages are installed */
void pkgProblemResolver::InstallProtect()
{
+ pkgDepCache::ActionGroup group(Cache);
+
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
{
if ((Flags[I->ID] & Protected) == Protected)
@@ -1196,7 +1230,7 @@ void pkgProblemResolver::InstallProtect()
if ((Flags[I->ID] & ToRemove) == ToRemove)
Cache.MarkDelete(I);
else
- Cache.MarkInstall(I,false);
+ Cache.MarkInstall(I, false, 0, false);
}
}
}
@@ -1232,3 +1266,4 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
qsort(List,Count,sizeof(*List),PrioComp);
}
/*}}}*/
+
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 64fa4636e..d5a9c7b0d 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -107,7 +107,7 @@ class pkgCache::VerIterator
// Iteration
void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;};
inline void operator ++() {operator ++(0);};
- inline bool end() const {return Ver == Owner->VerP?true:false;};
+ inline bool end() const {return Owner == NULL || (Ver == Owner->VerP?true:false);};
inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;};
// Comparison
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 09e454be9..14a000fa5 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -110,7 +110,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
return 0;
I = new Item;
- I->Tag = string(S,Len);
+ I->Tag.assign(S,Len);
I->Next = *Last;
I->Parent = Head;
*Last = I;
@@ -161,7 +161,7 @@ string Configuration::Find(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return string();
+ return "";
else
return Default;
}
@@ -180,7 +180,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return string();
+ return "";
else
return Default;
}
@@ -294,7 +294,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
// Configuration::CndSet - Conditinal Set a value /*{{{*/
// ---------------------------------------------------------------------
/* This will not overwrite */
-void Configuration::CndSet(const char *Name,string Value)
+void Configuration::CndSet(const char *Name,const string &Value)
{
Item *Itm = Lookup(Name,true);
if (Itm == 0)
@@ -306,7 +306,7 @@ void Configuration::CndSet(const char *Name,string Value)
// Configuration::Set - Set a value /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Set(const char *Name,string Value)
+void Configuration::Set(const char *Name,const string &Value)
{
Item *Itm = Lookup(Name,true);
if (Itm == 0)
@@ -330,7 +330,7 @@ void Configuration::Set(const char *Name,int Value)
// Configuration::Clear - Clear an single value from a list /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Clear(string Name, int Value)
+void Configuration::Clear(const string Name, int Value)
{
char S[300];
snprintf(S,sizeof(S),"%i",Value);
@@ -340,7 +340,7 @@ void Configuration::Clear(string Name, int Value)
// Configuration::Clear - Clear an single value from a list /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Clear(string Name, string Value)
+void Configuration::Clear(const string Name, string Value)
{
Item *Top = Lookup(Name.c_str(),false);
if (Top == 0 || Top->Child == 0)
@@ -377,7 +377,7 @@ void Configuration::Clear(string Name)
if (Top == 0)
return;
- Top->Value = string();
+ Top->Value.clear();
Item *Stop = Top;
Top = Top->Child;
Stop->Child = 0;
@@ -485,7 +485,7 @@ string Configuration::Item::FullTag(const Item *Stop) const
sections like 'zone "foo.org" { .. };' This causes each section to be
added in with a tag like "zone::foo.org" instead of being split
tag/value. AsSectional enables Sectional parsing.*/
-bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
+bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
unsigned Depth)
{
// Open the stream for reading
@@ -711,13 +711,13 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
}
// Empty the buffer
- LineBuffer = string();
+ LineBuffer.clear();
// Move up a tag, but only if there is no bit to parse
if (TermChar == '}')
{
if (StackPos == 0)
- ParentTag = string();
+ ParentTag.clear();
else
ParentTag = Stack[--StackPos];
}
@@ -742,8 +742,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
// ReadConfigDir - Read a directory of config files /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional,
- unsigned Depth)
+bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional,
+ unsigned Depth)
{
DIR *D = opendir(Dir.c_str());
if (D == 0)
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 789bc82cf..0d4078dab 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -69,30 +69,30 @@ class Configuration
public:
string Find(const char *Name,const char *Default = 0) const;
- string Find(string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
+ string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
string FindFile(const char *Name,const char *Default = 0) const;
string FindDir(const char *Name,const char *Default = 0) const;
int FindI(const char *Name,int Default = 0) const;
- int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
+ int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
bool FindB(const char *Name,bool Default = false) const;
- bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
+ bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
string FindAny(const char *Name,const char *Default = 0) const;
- inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};
- void CndSet(const char *Name,string Value);
- void Set(const char *Name,string Value);
+ inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);};
+ void CndSet(const char *Name,const string &Value);
+ void Set(const char *Name,const string &Value);
void Set(const char *Name,int Value);
- inline bool Exists(string Name) const {return Exists(Name.c_str());};
+ inline bool Exists(const string Name) const {return Exists(Name.c_str());};
bool Exists(const char *Name) const;
bool ExistsAny(const char *Name) const;
// clear a whole tree
- void Clear(string Name);
+ void Clear(const string Name);
// remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
- void Clear(string List, string Value);
- void Clear(string List, int Value);
+ void Clear(const string List, string Value);
+ void Clear(const string List, int Value);
inline const Item *Tree(const char *Name) const {return Lookup(Name);};
@@ -106,10 +106,12 @@ class Configuration
extern Configuration *_config;
-bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional = false,
+bool ReadConfigFile(Configuration &Conf,const string &FName,
+ bool AsSectional = false,
unsigned Depth = 0);
-bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional = false,
- unsigned Depth = 0);
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+ bool AsSectional = false,
+ unsigned Depth = 0);
#endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index b17b94319..9b22a90d3 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -36,6 +36,7 @@ bool Hashes::AddFD(int Fd,unsigned long Size)
Size -= Res;
MD5.Add(Buf,Res);
SHA1.Add(Buf,Res);
+ SHA256.Add(Buf,Res);
}
return true;
}
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 40bbe00a0..eefa7bf41 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -19,6 +19,7 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha256.h>
#include <algorithm>
@@ -30,10 +31,11 @@ class Hashes
MD5Summation MD5;
SHA1Summation SHA1;
+ SHA256Summation SHA256;
inline bool Add(const unsigned char *Data,unsigned long Size)
{
- return MD5.Add(Data,Size) && SHA1.Add(Data,Size);
+ return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size);
};
inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
bool AddFD(int Fd,unsigned long Size);
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9447e9956..e280d714e 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -29,6 +29,7 @@
#include <string>
#include <algorithm>
+#include <stdint.h>
using std::string;
using std::min;
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index caffa0f90..e329b167a 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -94,7 +94,7 @@ class DynamicMMap : public MMap
unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0);
unsigned long Allocate(unsigned long ItemSize);
unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
- inline unsigned long WriteString(string S) {return WriteString(S.c_str(),S.length());};
+ inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 8eb36fc20..cb272e389 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -50,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur)
// ---------------------------------------------------------------------
/* */
void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
- unsigned long Size,string Op)
+ unsigned long Size,const string &Op)
{
this->Current = Current;
this->Total = Total;
@@ -67,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
// OpProgress::SubProgress - Set the sub progress state /*{{{*/
// ---------------------------------------------------------------------
/* */
-void OpProgress::SubProgress(unsigned long SubTotal,string Op)
+void OpProgress::SubProgress(unsigned long SubTotal,const string &Op)
{
this->SubTotal = SubTotal;
SubOp = Op;
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index d0b1f5f94..20caf4cdf 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -59,9 +59,9 @@ class OpProgress
void Progress(unsigned long Current);
void SubProgress(unsigned long SubTotal);
- void SubProgress(unsigned long SubTotal,string Op);
+ void SubProgress(unsigned long SubTotal,const string &Op);
void OverallProgress(unsigned long Current,unsigned long Total,
- unsigned long Size,string Op);
+ unsigned long Size,const string &Op);
virtual void Done() {};
OpProgress();
diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc
new file mode 100644
index 000000000..b75ce8a84
--- /dev/null
+++ b/apt-pkg/contrib/sha256.cc
@@ -0,0 +1,424 @@
+/*
+ * Cryptographic API.
+ *
+ * SHA-256, as specified in
+ * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf
+ *
+ * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
+ *
+ * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
+ * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
+ * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ *
+ * Ported from the Linux kernel to Apt by Anthony Towns <ajt@debian.org>
+ *
+ * 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.
+ *
+ */
+#define SHA256_DIGEST_SIZE 32
+#define SHA256_HMAC_BLOCK_SIZE 64
+
+#define ror32(value,bits) (((value) >> (bits)) | ((value) << (32 - (bits))))
+
+#include <apt-pkg/sha256.h>
+#include <apt-pkg/strutl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <arpa/inet.h>
+
+typedef uint32_t u32;
+typedef uint8_t u8;
+
+static inline u32 Ch(u32 x, u32 y, u32 z)
+{
+ return z ^ (x & (y ^ z));
+}
+
+static inline u32 Maj(u32 x, u32 y, u32 z)
+{
+ return (x & y) | (z & (x | y));
+}
+
+#define e0(x) (ror32(x, 2) ^ ror32(x,13) ^ ror32(x,22))
+#define e1(x) (ror32(x, 6) ^ ror32(x,11) ^ ror32(x,25))
+#define s0(x) (ror32(x, 7) ^ ror32(x,18) ^ (x >> 3))
+#define s1(x) (ror32(x,17) ^ ror32(x,19) ^ (x >> 10))
+
+#define H0 0x6a09e667
+#define H1 0xbb67ae85
+#define H2 0x3c6ef372
+#define H3 0xa54ff53a
+#define H4 0x510e527f
+#define H5 0x9b05688c
+#define H6 0x1f83d9ab
+#define H7 0x5be0cd19
+
+static inline void LOAD_OP(int I, u32 *W, const u8 *input)
+{
+ W[I] = ( ((u32) input[I * 4 + 0] << 24)
+ | ((u32) input[I * 4 + 1] << 16)
+ | ((u32) input[I * 4 + 2] << 8)
+ | ((u32) input[I * 4 + 3]));
+}
+
+static inline void BLEND_OP(int I, u32 *W)
+{
+ W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
+}
+
+static void sha256_transform(u32 *state, const u8 *input)
+{
+ u32 a, b, c, d, e, f, g, h, t1, t2;
+ u32 W[64];
+ int i;
+
+ /* load the input */
+ for (i = 0; i < 16; i++)
+ LOAD_OP(i, W, input);
+
+ /* now blend */
+ for (i = 16; i < 64; i++)
+ BLEND_OP(i, W);
+
+ /* load the state into our registers */
+ a=state[0]; b=state[1]; c=state[2]; d=state[3];
+ e=state[4]; f=state[5]; g=state[6]; h=state[7];
+
+ /* now iterate */
+ t1 = h + e1(e) + Ch(e,f,g) + 0x428a2f98 + W[ 0];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0x71374491 + W[ 1];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0xb5c0fbcf + W[ 2];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0xe9b5dba5 + W[ 3];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x3956c25b + W[ 4];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0x59f111f1 + W[ 5];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x923f82a4 + W[ 6];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0xab1c5ed5 + W[ 7];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0xd807aa98 + W[ 8];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0x12835b01 + W[ 9];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0x243185be + W[10];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0x550c7dc3 + W[11];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x72be5d74 + W[12];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0x80deb1fe + W[13];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x9bdc06a7 + W[14];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0xc19bf174 + W[15];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0xe49b69c1 + W[16];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0xefbe4786 + W[17];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0x0fc19dc6 + W[18];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0x240ca1cc + W[19];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x2de92c6f + W[20];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0x4a7484aa + W[21];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x5cb0a9dc + W[22];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0x76f988da + W[23];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0x983e5152 + W[24];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0xa831c66d + W[25];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0xb00327c8 + W[26];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0xbf597fc7 + W[27];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0xc6e00bf3 + W[28];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0xd5a79147 + W[29];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x06ca6351 + W[30];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0x14292967 + W[31];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0x27b70a85 + W[32];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0x2e1b2138 + W[33];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0x4d2c6dfc + W[34];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0x53380d13 + W[35];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x650a7354 + W[36];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0x766a0abb + W[37];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x81c2c92e + W[38];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0x92722c85 + W[39];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0xa2bfe8a1 + W[40];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0xa81a664b + W[41];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0xc24b8b70 + W[42];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0xc76c51a3 + W[43];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0xd192e819 + W[44];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0xd6990624 + W[45];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0xf40e3585 + W[46];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0x106aa070 + W[47];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0x19a4c116 + W[48];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0x1e376c08 + W[49];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0x2748774c + W[50];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0x34b0bcb5 + W[51];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x391c0cb3 + W[52];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0x4ed8aa4a + W[53];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0x5b9cca4f + W[54];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0x682e6ff3 + W[55];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ t1 = h + e1(e) + Ch(e,f,g) + 0x748f82ee + W[56];
+ t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2;
+ t1 = g + e1(d) + Ch(d,e,f) + 0x78a5636f + W[57];
+ t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2;
+ t1 = f + e1(c) + Ch(c,d,e) + 0x84c87814 + W[58];
+ t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2;
+ t1 = e + e1(b) + Ch(b,c,d) + 0x8cc70208 + W[59];
+ t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2;
+ t1 = d + e1(a) + Ch(a,b,c) + 0x90befffa + W[60];
+ t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2;
+ t1 = c + e1(h) + Ch(h,a,b) + 0xa4506ceb + W[61];
+ t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2;
+ t1 = b + e1(g) + Ch(g,h,a) + 0xbef9a3f7 + W[62];
+ t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2;
+ t1 = a + e1(f) + Ch(f,g,h) + 0xc67178f2 + W[63];
+ t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2;
+
+ state[0] += a; state[1] += b; state[2] += c; state[3] += d;
+ state[4] += e; state[5] += f; state[6] += g; state[7] += h;
+
+ /* clear any sensitive info... */
+ a = b = c = d = e = f = g = h = t1 = t2 = 0;
+ memset(W, 0, 64 * sizeof(u32));
+}
+
+SHA256Summation::SHA256Summation()
+{
+ Sum.state[0] = H0;
+ Sum.state[1] = H1;
+ Sum.state[2] = H2;
+ Sum.state[3] = H3;
+ Sum.state[4] = H4;
+ Sum.state[5] = H5;
+ Sum.state[6] = H6;
+ Sum.state[7] = H7;
+ Sum.count[0] = Sum.count[1] = 0;
+ memset(Sum.buf, 0, sizeof(Sum.buf));
+ Done = false;
+}
+
+bool SHA256Summation::Add(const u8 *data, unsigned long len)
+{
+ struct sha256_ctx *sctx = &Sum;
+ unsigned int i, index, part_len;
+
+ if (Done) return false;
+
+ /* Compute number of bytes mod 128 */
+ index = (unsigned int)((sctx->count[0] >> 3) & 0x3f);
+
+ /* Update number of bits */
+ if ((sctx->count[0] += (len << 3)) < (len << 3)) {
+ sctx->count[1]++;
+ sctx->count[1] += (len >> 29);
+ }
+
+ part_len = 64 - index;
+
+ /* Transform as many times as possible. */
+ if (len >= part_len) {
+ memcpy(&sctx->buf[index], data, part_len);
+ sha256_transform(sctx->state, sctx->buf);
+
+ for (i = part_len; i + 63 < len; i += 64)
+ sha256_transform(sctx->state, &data[i]);
+ index = 0;
+ } else {
+ i = 0;
+ }
+
+ /* Buffer remaining input */
+ memcpy(&sctx->buf[index], &data[i], len-i);
+
+ return true;
+}
+
+SHA256SumValue SHA256Summation::Result()
+{
+ struct sha256_ctx *sctx = &Sum;
+ if (!Done) {
+ u8 bits[8];
+ unsigned int index, pad_len, t;
+ static const u8 padding[64] = { 0x80, };
+
+ /* Save number of bits */
+ t = sctx->count[0];
+ bits[7] = t; t >>= 8;
+ bits[6] = t; t >>= 8;
+ bits[5] = t; t >>= 8;
+ bits[4] = t;
+ t = sctx->count[1];
+ bits[3] = t; t >>= 8;
+ bits[2] = t; t >>= 8;
+ bits[1] = t; t >>= 8;
+ bits[0] = t;
+
+ /* Pad out to 56 mod 64. */
+ index = (sctx->count[0] >> 3) & 0x3f;
+ pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
+ Add(padding, pad_len);
+
+ /* Append length (before padding) */
+ Add(bits, 8);
+ }
+
+ Done = true;
+
+ /* Store state in digest */
+
+ SHA256SumValue res;
+ u8 *out = res.Sum;
+
+ int i, j;
+ unsigned int t;
+ for (i = j = 0; i < 8; i++, j += 4) {
+ t = sctx->state[i];
+ out[j+3] = t; t >>= 8;
+ out[j+2] = t; t >>= 8;
+ out[j+1] = t; t >>= 8;
+ out[j ] = t;
+ }
+
+ return res;
+}
+
+// SHA256SumValue::SHA256SumValue - Constructs the sum from a string /*{{{*/
+// ---------------------------------------------------------------------
+/* The string form of a SHA256 is a 64 character hex number */
+SHA256SumValue::SHA256SumValue(string Str)
+{
+ memset(Sum,0,sizeof(Sum));
+ Set(Str);
+}
+
+ /*}}}*/
+// SHA256SumValue::SHA256SumValue - Default constructor /*{{{*/
+// ---------------------------------------------------------------------
+/* Sets the value to 0 */
+SHA256SumValue::SHA256SumValue()
+{
+ memset(Sum,0,sizeof(Sum));
+}
+
+ /*}}}*/
+// SHA256SumValue::Set - Set the sum from a string /*{{{*/
+// ---------------------------------------------------------------------
+/* Converts the hex string into a set of chars */
+bool SHA256SumValue::Set(string Str)
+{
+ return Hex2Num(Str,Sum,sizeof(Sum));
+}
+ /*}}}*/
+// SHA256SumValue::Value - Convert the number into a string /*{{{*/
+// ---------------------------------------------------------------------
+/* Converts the set of chars into a hex string in lower case */
+string SHA256SumValue::Value() const
+{
+ char Conv[16] =
+ { '0','1','2','3','4','5','6','7','8','9','a','b',
+ 'c','d','e','f'
+ };
+ char Result[65];
+ Result[64] = 0;
+
+ // Convert each char into two letters
+ int J = 0;
+ int I = 0;
+ for (; I != 64; J++,I += 2)
+ {
+ Result[I] = Conv[Sum[J] >> 4];
+ Result[I + 1] = Conv[Sum[J] & 0xF];
+ }
+
+ return string(Result);
+}
+
+
+
+// SHA256SumValue::operator == - Comparator /*{{{*/
+// ---------------------------------------------------------------------
+/* Call memcmp on the buffer */
+bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const
+{
+ return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
+}
+ /*}}}*/
+
+
+// SHA256Summation::AddFD - Add content of file into the checksum /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool SHA256Summation::AddFD(int Fd,unsigned long Size)
+{
+ unsigned char Buf[64 * 64];
+ int Res = 0;
+ int ToEOF = (Size == 0);
+ while (Size != 0 || ToEOF)
+ {
+ unsigned n = sizeof(Buf);
+ if (!ToEOF) n = min(Size,(unsigned long)n);
+ Res = read(Fd,Buf,n);
+ if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+ return false;
+ if (ToEOF && Res == 0) // EOF
+ break;
+ Size -= Res;
+ Add(Buf,Res);
+ }
+ return true;
+}
+ /*}}}*/
+
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
new file mode 100644
index 000000000..9e88f5ece
--- /dev/null
+++ b/apt-pkg/contrib/sha256.h
@@ -0,0 +1,75 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
+/* ######################################################################
+
+ SHA256SumValue - Storage for a SHA-256 hash.
+ SHA256Summation - SHA-256 Secure Hash Algorithm.
+
+ This is a C++ interface to a set of SHA256Sum functions, that mirrors
+ the equivalent MD5 & SHA1 classes.
+
+ ##################################################################### */
+ /*}}}*/
+#ifndef APTPKG_SHA256_H
+#define APTPKG_SHA256_H
+
+#ifdef __GNUG__
+#pragma interface "apt-pkg/sha256.h"
+#endif
+
+#include <string>
+#include <algorithm>
+#include <stdint.h>
+
+using std::string;
+using std::min;
+
+class SHA256Summation;
+
+class SHA256SumValue
+{
+ friend class SHA256Summation;
+ unsigned char Sum[32];
+
+ public:
+
+ // Accessors
+ bool operator ==(const SHA256SumValue &rhs) const;
+ string Value() const;
+ inline void Value(unsigned char S[32])
+ {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
+ inline operator string() const {return Value();};
+ bool Set(string Str);
+ inline void Set(unsigned char S[32])
+ {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
+
+ SHA256SumValue(string Str);
+ SHA256SumValue();
+};
+
+struct sha256_ctx {
+ uint32_t count[2];
+ uint32_t state[8];
+ uint8_t buf[128];
+};
+
+class SHA256Summation
+{
+ struct sha256_ctx Sum;
+
+ bool Done;
+
+ public:
+
+ bool Add(const unsigned char *inbuf,unsigned long inlen);
+ inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
+ bool AddFD(int Fd,unsigned long Size);
+ inline bool Add(const unsigned char *Beg,const unsigned char *End)
+ {return Add(Beg,End-Beg);};
+ SHA256SumValue Result();
+
+ SHA256Summation();
+};
+
+#endif
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 303cb27db..37d263794 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -242,10 +242,10 @@ bool ParseCWord(const char *&String,string &Res)
// QuoteString - Convert a string into quoted from /*{{{*/
// ---------------------------------------------------------------------
/* */
-string QuoteString(string Str,const char *Bad)
+string QuoteString(const string &Str, const char *Bad)
{
string Res;
- for (string::iterator I = Str.begin(); I != Str.end(); I++)
+ for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
{
if (strchr(Bad,*I) != 0 || isprint(*I) == 0 ||
*I <= 0x20 || *I >= 0x7F)
@@ -263,7 +263,7 @@ string QuoteString(string Str,const char *Bad)
// DeQuoteString - Convert a string from quoted from /*{{{*/
// ---------------------------------------------------------------------
/* This undoes QuoteString */
-string DeQuoteString(string Str)
+string DeQuoteString(const string &Str)
{
string Res;
for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
@@ -360,7 +360,7 @@ string TimeToStr(unsigned long Sec)
// SubstVar - Substitute a string for another string /*{{{*/
// ---------------------------------------------------------------------
/* This replaces all occurances of Subst with Contents in Str. */
-string SubstVar(string Str,string Subst,string Contents)
+string SubstVar(const string &Str,const string &Subst,const string &Contents)
{
string::size_type Pos = 0;
string::size_type OldPos = 0;
@@ -391,21 +391,18 @@ string SubstVar(string Str,const struct SubstVar *Vars)
/* This converts a URI into a safe filename. It quotes all unsafe characters
and converts / to _ and removes the scheme identifier. The resulting
file name should be unique and never occur again for a different file */
-string URItoFileName(string URI)
+string URItoFileName(const string &URI)
{
// Nuke 'sensitive' items
::URI U(URI);
- U.User = string();
- U.Password = string();
- U.Access = "";
+ U.User.clear();
+ U.Password.clear();
+ U.Access.clear();
// "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
- URI = QuoteString(U,"\\|{}[]<>\"^~=!@#$%^&*");
- string::iterator J = URI.begin();
- for (; J != URI.end(); J++)
- if (*J == '/')
- *J = '_';
- return URI;
+ string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
+ replace(NewURI.begin(),NewURI.end(),'/','_');
+ return NewURI;
}
/*}}}*/
// Base64Encode - Base64 Encoding routine for short strings /*{{{*/
@@ -414,7 +411,7 @@ string URItoFileName(string URI)
from wget and then patched and bug fixed.
This spec can be found in rfc2045 */
-string Base64Encode(string S)
+string Base64Encode(const string &S)
{
// Conversion table.
static char tbl[64] = {'A','B','C','D','E','F','G','H',
@@ -583,17 +580,17 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
// ---------------------------------------------------------------------
/* The format is like those used in package files and the method
communication system */
-string LookupTag(string Message,const char *Tag,const char *Default)
+string LookupTag(const string &Message,const char *Tag,const char *Default)
{
// Look for a matching tag.
int Length = strlen(Tag);
- for (string::iterator I = Message.begin(); I + Length < Message.end(); I++)
+ for (string::const_iterator I = Message.begin(); I + Length < Message.end(); I++)
{
// Found the tag
if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0)
{
// Find the end of line and strip the leading/trailing spaces
- string::iterator J;
+ string::const_iterator J;
I += Length + 1;
for (; isspace(*I) != 0 && I < Message.end(); I++);
for (J = I; *J != '\n' && J < Message.end(); J++);
@@ -615,7 +612,7 @@ string LookupTag(string Message,const char *Tag,const char *Default)
// ---------------------------------------------------------------------
/* This inspects the string to see if it is true or if it is false and
then returns the result. Several varients on true/false are checked. */
-int StringToBool(string Text,int Default)
+int StringToBool(const string &Text,int Default)
{
char *End;
int Res = strtol(Text.c_str(),&End,0);
@@ -781,7 +778,7 @@ static time_t timegm(struct tm *t)
'timegm' to convert a struct tm in UTC to a time_t. For some bizzar
reason the C library does not provide any such function :< This also
handles the weird, but unambiguous FTP time format*/
-bool StrToTime(string Val,time_t &Result)
+bool StrToTime(const string &Val,time_t &Result)
{
struct tm Tm;
char Month[10];
@@ -868,7 +865,7 @@ static int HexDigit(int c)
// Hex2Num - Convert a long hex number into a buffer /*{{{*/
// ---------------------------------------------------------------------
/* The length of the buffer must be exactly 1/2 the length of the string. */
-bool Hex2Num(string Str,unsigned char *Num,unsigned int Length)
+bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length)
{
if (Str.length() != Length*2)
return false;
@@ -1029,7 +1026,7 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
// ---------------------------------------------------------------------
/* The domain list is a comma seperate list of domains that are suffix
matched against the argument */
-bool CheckDomainList(string Host,string List)
+bool CheckDomainList(const string &Host,const string &List)
{
string::const_iterator Start = List.begin();
for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++)
@@ -1052,7 +1049,7 @@ bool CheckDomainList(string Host,string List)
// URI::CopyFrom - Copy from an object /*{{{*/
// ---------------------------------------------------------------------
/* This parses the URI into all of its components */
-void URI::CopyFrom(string U)
+void URI::CopyFrom(const string &U)
{
string::const_iterator I = U.begin();
@@ -1081,9 +1078,9 @@ void URI::CopyFrom(string U)
SingleSlash = U.end();
// We can now write the access and path specifiers
- Access = string(U,0,FirstColon - U.begin());
+ Access.assign(U.begin(),FirstColon);
if (SingleSlash != U.end())
- Path = string(U,SingleSlash - U.begin());
+ Path.assign(SingleSlash,U.end());
if (Path.empty() == true)
Path = "/";
@@ -1113,14 +1110,14 @@ void URI::CopyFrom(string U)
if (At == SingleSlash)
{
if (FirstColon < SingleSlash)
- Host = string(U,FirstColon - U.begin(),SingleSlash - FirstColon);
+ Host.assign(FirstColon,SingleSlash);
}
else
{
- Host = string(U,At - U.begin() + 1,SingleSlash - At - 1);
- User = string(U,FirstColon - U.begin(),SecondColon - FirstColon);
+ Host.assign(At+1,SingleSlash);
+ User.assign(FirstColon,SecondColon);
if (SecondColon < At)
- Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1);
+ Password.assign(SecondColon+1,At);
}
// Now we parse the RFC 2732 [] hostnames.
@@ -1148,7 +1145,7 @@ void URI::CopyFrom(string U)
// Tsk, weird.
if (InBracket == true)
{
- Host = string();
+ Host.clear();
return;
}
@@ -1159,7 +1156,7 @@ void URI::CopyFrom(string U)
return;
Port = atoi(string(Host,Pos+1).c_str());
- Host = string(Host,0,Pos);
+ Host.assign(Host,0,Pos);
}
/*}}}*/
// URI::operator string - Convert the URI to a string /*{{{*/
@@ -1214,12 +1211,12 @@ URI::operator string()
// URI::SiteOnly - Return the schema and site for the URI /*{{{*/
// ---------------------------------------------------------------------
/* */
-string URI::SiteOnly(string URI)
+string URI::SiteOnly(const string &URI)
{
::URI U(URI);
- U.User = string();
- U.Password = string();
- U.Path = string();
+ U.User.clear();
+ U.Password.clear();
+ U.Path.clear();
U.Port = 0;
return U;
}
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 72fc34d6d..254087267 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -44,24 +44,24 @@ char *_strstrip(char *String);
char *_strtabexpand(char *String,size_t Len);
bool ParseQuoteWord(const char *&String,string &Res);
bool ParseCWord(const char *&String,string &Res);
-string QuoteString(string Str,const char *Bad);
-string DeQuoteString(string Str);
+string QuoteString(const string &Str,const char *Bad);
+string DeQuoteString(const string &Str);
string SizeToStr(double Bytes);
string TimeToStr(unsigned long Sec);
-string Base64Encode(string Str);
-string URItoFileName(string URI);
+string Base64Encode(const string &Str);
+string URItoFileName(const string &URI);
string TimeRFC1123(time_t Date);
-bool StrToTime(string Val,time_t &Result);
-string LookupTag(string Message,const char *Tag,const char *Default = 0);
-int StringToBool(string Text,int Default = -1);
+bool StrToTime(const string &Val,time_t &Result);
+string LookupTag(const string &Message,const char *Tag,const char *Default = 0);
+int StringToBool(const string &Text,int Default = -1);
bool ReadMessages(int Fd, vector<string> &List);
bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0);
-bool Hex2Num(string Str,unsigned char *Num,unsigned int Length);
+bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
bool TokSplitString(char Tok,char *Input,char **List,
unsigned long ListMax);
void ioprintf(ostream &out,const char *format,...) APT_FORMAT2;
char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3;
-bool CheckDomainList(string Host,string List);
+bool CheckDomainList(const string &Host, const string &List);
#define APT_MKSTRCMP(name,func) \
inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
@@ -102,7 +102,7 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
class URI
{
- void CopyFrom(string From);
+ void CopyFrom(const string &From);
public:
@@ -114,9 +114,9 @@ class URI
unsigned int Port;
operator string();
- inline void operator =(string From) {CopyFrom(From);};
+ inline void operator =(const string &From) {CopyFrom(From);};
inline bool empty() {return Access.empty();};
- static string SiteOnly(string URI);
+ static string SiteOnly(const string &URI);
URI(string Path) {CopyFrom(Path);};
URI() : Port(0) {};
@@ -128,7 +128,7 @@ struct SubstVar
const string *Contents;
};
string SubstVar(string Str,const struct SubstVar *Vars);
-string SubstVar(string Str,string Subst,string Contents);
+string SubstVar(const string &Str,const string &Subst,const string &Contents);
struct RxChoiceList
{
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 97553ab82..c2b26b5eb 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -420,12 +420,12 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
const char *End = I;
for (; End > Start && isspace(End[-1]); End--);
- Ver = string(Start,End-Start);
+ Ver.assign(Start,End-Start);
I++;
}
else
{
- Ver = string();
+ Ver.clear();
Op = pkgCache::Dep::NoOp;
}
@@ -547,11 +547,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
Start = ParseDepends(Start,Stop,Package,Version,Op);
if (Start == 0)
return _error->Error("Problem parsing Provides line");
- if (Op != pkgCache::Dep::NoOp)
- return _error->Error("Malformed provides line");
-
- if (NewProvides(Ver,Package,Version) == false)
- return false;
+ if (Op != pkgCache::Dep::NoOp) {
+ _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+ } else {
+ if (NewProvides(Ver,Package,Version) == false)
+ return false;
+ }
if (Start == Stop)
break;
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index a3fc39302..8cf31b326 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -175,7 +175,7 @@ bool debReleaseIndex::IsTrusted() const
string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
URItoFileName(MetaIndexURI("Release")) + ".gpg";
- if(_config->FindB("APT::Authentication::Trust-CDROM", false))
+ if(_config->FindB("APT::Authentication::TrustCDROM", false))
if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
return true;
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index aeee61929..064d8fa5b 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -59,7 +59,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
}
/* Iterate over the whole string
- What this does is to spilt the whole string into groups of
+ What this does is to split the whole string into groups of
numeric and non numeric portions. For instance:
a67bhgs89
Has 4 portions 'a', '67', 'bhgs', '89'. A more normal:
@@ -140,6 +140,27 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
if (rhs == BEnd)
rhs = B;
+ // Special case: a zero epoch is the same as no epoch,
+ // so remove it.
+ if (lhs != A)
+ {
+ for (; *A == '0'; ++A);
+ if (A == lhs)
+ {
+ ++A;
+ ++lhs;
+ }
+ }
+ if (rhs != B)
+ {
+ for (; *B == '0'; ++B);
+ if (B == rhs)
+ {
+ ++B;
+ ++rhs;
+ }
+ }
+
// Compare the epoch
int Res = CmpFragment(A,lhs,B,rhs);
if (Res != 0)
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fe8fbca74..bf0434ccc 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
},
// Purge operation
{
- {"config-files", _("Preparing for remove with config %s")},
- {"not-installed", _("Removed with config %s")},
+ {"config-files", _("Preparing to completely remove %s")},
+ {"not-installed", _("Completely removed %s")},
{NULL, NULL}
},
};
@@ -623,8 +623,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
*/
- char* list[4];
- TokSplitString(':', line, list, 5);
+ char* list[5];
+ if(!TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])))
+ // FIXME: dpkg sends multiline error messages sometimes (see
+ // #374195 for a example. we should support this by
+ // either patching dpkg to not send multiline over the
+ // statusfd or by rewriting the code here to deal with
+ // it. for now we just ignore it and not crash
+ continue;
char *pkg = list[1];
char *action = _strstrip(list[2]);
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 2ff8a9ac7..0b181dc43 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -47,7 +47,7 @@ class pkgDPkgPM : public pkgPackageManager
bool RunScripts(const char *Cnf);
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
-
+
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
virtual bool Configure(PkgIterator Pkg);
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index dd1c794c9..abe2842cc 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -16,15 +16,52 @@
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/algorithms.h>
-
+
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/tagfile.h>
+
+#include <iostream>
+#include <sstream>
+#include <set>
+
#include <apti18n.h>
- /*}}}*/
+
+pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
+ cache(cache), released(false)
+{
+ ++cache.group_level;
+}
+
+void pkgDepCache::ActionGroup::release()
+{
+ if(!released)
+ {
+ if(cache.group_level == 0)
+ std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
+ else
+ {
+ --cache.group_level;
+
+ if(cache.group_level == 0)
+ cache.MarkAndSweep();
+ }
+
+ released = false;
+ }
+}
+
+pkgDepCache::ActionGroup::~ActionGroup()
+{
+ release();
+}
// DepCache::pkgDepCache - Constructors /*{{{*/
// ---------------------------------------------------------------------
/* */
pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
- Cache(pCache), PkgState(0), DepState(0)
+ group_level(0), Cache(pCache), PkgState(0), DepState(0)
{
delLocalPolicy = 0;
LocalPolicy = Plcy;
@@ -47,6 +84,10 @@ pkgDepCache::~pkgDepCache()
/* This allocats the extension buffers and initializes them. */
bool pkgDepCache::Init(OpProgress *Prog)
{
+ // Suppress mark updates during this operation (just in case) and
+ // run a mark operation when Init terminates.
+ ActionGroup actions(*this);
+
delete [] PkgState;
delete [] DepState;
PkgState = new StateCache[Head().PackageCount];
@@ -72,7 +113,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
// Find the proper cache slot
StateCache &State = PkgState[I->ID];
State.iFlags = 0;
-
+
// Figure out the install version
State.CandidateVer = GetCandidateVer(I);
State.InstallVer = I.CurrentVer();
@@ -94,11 +135,130 @@ bool pkgDepCache::Init(OpProgress *Prog)
if(Prog != 0)
Prog->Done();
-
+
return true;
}
/*}}}*/
+bool pkgDepCache::readStateFile(OpProgress *Prog)
+{
+ FileFd state_file;
+ string state = _config->FindDir("Dir::State") + "extended_states";
+ if(FileExists(state)) {
+ state_file.Open(state, FileFd::ReadOnly);
+ int file_size = state_file.Size();
+ if(Prog != NULL)
+ Prog->OverallProgress(0, file_size, 1,
+ _("Reading state information"));
+
+ pkgTagFile tagfile(&state_file);
+ pkgTagSection section;
+ int amt=0;
+ while(tagfile.Step(section)) {
+ string pkgname = section.FindS("Package");
+ pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
+ // Silently ignore unknown packages and packages with no actual
+ // version.
+ if(!pkg.end() && !pkg.VersionList().end()) {
+ short reason = section.FindI("Auto-Installed", 0);
+ if(reason > 0)
+ PkgState[pkg->ID].Flags |= Flag::Auto;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::cout << "Auto-Installed : " << pkgname << std::endl;
+ amt+=section.size();
+ if(Prog != NULL)
+ Prog->OverallProgress(amt, file_size, 1,
+ _("Reading state information"));
+ }
+ if(Prog != NULL)
+ Prog->OverallProgress(file_size, file_size, 1,
+ _("Reading state information"));
+ }
+ }
+
+ return true;
+}
+
+bool pkgDepCache::writeStateFile(OpProgress *prog)
+{
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "pkgDepCache::writeStateFile()" << std::endl;
+
+ FileFd StateFile;
+ string state = _config->FindDir("Dir::State") + "extended_states";
+
+ // if it does not exist, create a empty one
+ if(!FileExists(state))
+ {
+ StateFile.Open(state, FileFd::WriteEmpty);
+ StateFile.Close();
+ }
+
+ // open it
+ if(!StateFile.Open(state, FileFd::ReadOnly))
+ return _error->Error(_("Failed to open StateFile %s"),
+ state.c_str());
+
+ FILE *OutFile;
+ string outfile = state + ".tmp";
+ if((OutFile = fopen(outfile.c_str(),"w")) == NULL)
+ return _error->Error(_("Failed to write temporary StateFile %s"),
+ outfile.c_str());
+
+ // first merge with the existing sections
+ pkgTagFile tagfile(&StateFile);
+ pkgTagSection section;
+ std::set<string> pkgs_seen;
+ const char *nullreorderlist[] = {0};
+ while(tagfile.Step(section)) {
+ string pkgname = section.FindS("Package");
+ // Silently ignore unknown packages and packages with no actual
+ // version.
+ pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
+ if(pkg.end() || pkg.VersionList().end())
+ continue;
+ bool oldAuto = section.FindI("Auto-Installed");
+ bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Update exisiting AutoInstall info: "
+ << pkg.Name() << std::endl;
+ TFRewriteData rewrite[2];
+ rewrite[0].Tag = "Auto-Installed";
+ rewrite[0].Rewrite = newAuto ? "1" : "0";
+ rewrite[0].NewTag = 0;
+ rewrite[1].Tag = 0;
+ TFRewrite(OutFile, section, nullreorderlist, rewrite);
+ fprintf(OutFile,"\n");
+ pkgs_seen.insert(pkgname);
+ }
+
+ // then write the ones we have not seen yet
+ std::ostringstream ostr;
+ for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) {
+ if(PkgState[pkg->ID].Flags & Flag::Auto) {
+ if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) {
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Skipping already written " << pkg.Name() << std::endl;
+ continue;
+ }
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::clog << "Writing new AutoInstall: "
+ << pkg.Name() << std::endl;
+ ostr.str(string(""));
+ ostr << "Package: " << pkg.Name()
+ << "\nAuto-Installed: 1\n\n";
+ fprintf(OutFile,ostr.str().c_str());
+ fprintf(OutFile,"\n");
+ }
+ }
+ fclose(OutFile);
+
+ // move the outfile over the real file
+ rename(outfile.c_str(), state.c_str());
+
+ return true;
+}
+
// DepCache::CheckDep - Checks a single dependency /*{{{*/
// ---------------------------------------------------------------------
/* This first checks the dependency against the main target package and
@@ -239,9 +399,11 @@ void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add)
{
StateCache &State = PkgState[Pkg->ID];
- // The Package is broken
+ // The Package is broken (either minimal dep or policy dep)
if ((State.DepState & DepInstMin) != DepInstMin)
iBrokenCount += Add;
+ if ((State.DepState & DepInstPolicy) != DepInstPolicy)
+ iPolicyBrokenCount += Add;
// Bad state
if (Pkg.State() != PkgIterator::NeedsNothing)
@@ -452,12 +614,14 @@ void pkgDepCache::Update(OpProgress *Prog)
if (Prog != 0)
Prog->Progress(Done);
+
+ readStateFile(Prog);
}
/*}}}*/
// DepCache::Update - Update the deps list of a package /*{{{*/
// ---------------------------------------------------------------------
/* This is a helper for update that only does the dep portion of the scan.
- It is mainly ment to scan reverse dependencies. */
+ It is mainly meant to scan reverse dependencies. */
void pkgDepCache::Update(DepIterator D)
{
// Update the reverse deps
@@ -509,7 +673,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg)
// DepCache::MarkKeep - Put the package in the keep state /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
+void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
{
// Simplifies other routines.
if (Pkg.end() == true)
@@ -521,6 +685,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
Pkg.CurrentVer().Downloadable() == false)
return;
+ /** \todo Can this be moved later in the method? */
+ ActionGroup group(*this);
+
/* We changed the soft state all the time so the UI is a bit nicer
to use */
StateCache &P = PkgState[Pkg->ID];
@@ -537,7 +704,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
if (Pkg->VersionList == 0)
return;
- P.Flags &= ~Flag::Auto;
+ if(FromUser && !P.Marked)
+ P.Flags &= ~Flag::Auto;
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -563,6 +731,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
if (Pkg.end() == true)
return;
+ ActionGroup group(*this);
+
// Check that it is not already marked for delete
StateCache &P = PkgState[Pkg->ID];
P.iFlags &= ~(AutoKept | Purge);
@@ -585,7 +755,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
else
P.Mode = ModeDelete;
P.InstallVer = 0;
- P.Flags &= Flag::Auto;
AddStates(Pkg);
Update(Pkg);
@@ -596,7 +765,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge)
// ---------------------------------------------------------------------
/* */
void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
- unsigned long Depth)
+ unsigned long Depth, bool FromUser,
+ bool ForceImportantDeps)
{
if (Depth > 100)
return;
@@ -605,26 +775,27 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
if (Pkg.end() == true)
return;
+ ActionGroup group(*this);
+
/* Check that it is not already marked for install and that it can be
installed */
StateCache &P = PkgState[Pkg->ID];
P.iFlags &= ~AutoKept;
- if (P.InstBroken() == false && (P.Mode == ModeInstall ||
+ if ((P.InstPolicyBroken() == false && P.InstBroken() == false) &&
+ (P.Mode == ModeInstall ||
P.CandidateVer == (Version *)Pkg.CurrentVer()))
{
if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
- MarkKeep(Pkg);
+ MarkKeep(Pkg, false, FromUser);
return;
}
// See if there is even any possible instalation candidate
if (P.CandidateVer == 0)
return;
-
// We dont even try to install virtual packages..
if (Pkg->VersionList == 0)
return;
-
/* Target the candidate version and remove the autoflag. We reset the
autoflag below if this was called recursively. Otherwise the user
should have the ability to de-auto a package by changing its state */
@@ -633,7 +804,20 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
P.Mode = ModeInstall;
P.InstallVer = P.CandidateVer;
- P.Flags &= ~Flag::Auto;
+
+ if(FromUser)
+ {
+ // Set it to manual if it's a new install or cancelling the
+ // removal of a garbage package.
+ if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked))
+ P.Flags &= ~Flag::Auto;
+ }
+ else
+ {
+ // Set it to auto if this is a new install.
+ if(P.Status == 2)
+ P.Flags |= Flag::Auto;
+ }
if (P.CandidateVer == (Version *)Pkg.CurrentVer())
P.Mode = ModeKeep;
@@ -665,10 +849,40 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
/* Check if this dep should be consider for install. If it is a user
defined important dep and we are installed a new package then
- it will be installed. Otherwise we only worry about critical deps */
+ it will be installed. Otherwise we only check for important
+ deps that have changed from the installed version
+ */
if (IsImportantDep(Start) == false)
continue;
- if (Pkg->CurrentVer != 0 && Start.IsCritical() == false)
+
+ /* check if any ImportantDep() (but not Critial) where added
+ * since we installed the package
+ */
+ bool isNewImportantDep = false;
+ if(!ForceImportantDeps && !Start.IsCritical())
+ {
+ bool found=false;
+ VerIterator instVer = Pkg.CurrentVer();
+ for (DepIterator D = instVer.DependsList(); D.end() != true; D++)
+ {
+ //FIXME: deal better with or-groups(?)
+ DepIterator LocalStart = D;
+
+ if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg())
+ found=true;
+ }
+ // this is a new dep if it was not found to be already
+ // a important dep of the installed pacakge
+ isNewImportantDep = !found;
+ }
+ if(isNewImportantDep)
+ if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+ std::clog << "new important dependency: "
+ << Start.TargetPkg().Name() << std::endl;
+
+ // skip important deps if the package is already installed
+ if (Pkg->CurrentVer != 0 && Start.IsCritical() == false
+ && !isNewImportantDep && !ForceImportantDeps)
continue;
/* If we are in an or group locate the first or that can
@@ -710,15 +924,18 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
}
}
- if (InstPkg.end() == false)
+ if (InstPkg.end() == false)
{
- MarkInstall(InstPkg,true,Depth + 1);
+ if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+ std::clog << "Installing " << InstPkg.Name()
+ << " as dep of " << Pkg.Name()
+ << std::endl;
+ MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
// Set the autoflag, after MarkInstall because MarkInstall unsets it
if (P->CurrentVer == 0)
PkgState[InstPkg->ID].Flags |= Flag::Auto;
}
-
continue;
}
@@ -732,7 +949,6 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
PkgIterator Pkg = Ver.ParentPkg();
MarkDelete(Pkg);
- PkgState[Pkg->ID].Flags |= Flag::Auto;
}
continue;
}
@@ -744,6 +960,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
/* */
void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
{
+ ActionGroup group(*this);
+
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -762,9 +980,11 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
/* */
void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
{
+ ActionGroup group(*this);
+
pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
StateCache &P = PkgState[Pkg->ID];
-
+
RemoveSizes(Pkg);
RemoveStates(Pkg);
@@ -777,6 +997,18 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
Update(Pkg);
AddSizes(Pkg);
}
+
+void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto)
+{
+ StateCache &state = PkgState[Pkg->ID];
+
+ ActionGroup group(*this);
+
+ if(Auto)
+ state.Flags |= Flag::Auto;
+ else
+ state.Flags &= ~Flag::Auto;
+}
/*}}}*/
// StateCache::Update - Compute the various static display things /*{{{*/
// ---------------------------------------------------------------------
@@ -859,11 +1091,233 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg)
return Last;
}
/*}}}*/
+ /*}}}*/
+
+pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
+ : constructedSuccessfully(false)
+{
+ Configuration::Item const *Opts;
+ Opts = _config->Tree("APT::NeverAutoRemove");
+ if (Opts != 0 && Opts->Child != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+
+ regex_t *p = new regex_t;
+ if(regcomp(p,Opts->Value.c_str(),
+ REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
+ {
+ regfree(p);
+ delete p;
+ _error->Error("Regex compilation error for APT::NeverAutoRemove");
+ return;
+ }
+
+ rootSetRegexp.push_back(p);
+ }
+ }
+
+ constructedSuccessfully = true;
+}
+
+pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
+{
+ for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
+ {
+ regfree(rootSetRegexp[i]);
+ delete rootSetRegexp[i];
+ }
+}
+
+
+bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg)
+{
+ for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
+ if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0)
+ return true;
+
+ return false;
+}
+
+pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
+{
+ DefaultRootSetFunc *f = new DefaultRootSetFunc;
+ if(f->wasConstructedSuccessfully())
+ return f;
+ else
+ {
+ delete f;
+ return NULL;
+ }
+}
+
+bool pkgDepCache::MarkFollowsRecommends()
+{
+ return _config->FindB("APT::AutoRemove::RecommendsImportant", true);
+}
+
+bool pkgDepCache::MarkFollowsSuggests()
+{
+ return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
+}
+
+// the main mark algorithm
+bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
+{
+ bool follow_recommends;
+ bool follow_suggests;
+
+ // init the states
+ for(PkgIterator p = PkgBegin(); !p.end(); ++p)
+ {
+ PkgState[p->ID].Marked = false;
+ PkgState[p->ID].Garbage = false;
+
+ // debug output
+ if(_config->FindB("Debug::pkgAutoRemove",false)
+ && PkgState[p->ID].Flags & Flag::Auto)
+ std::clog << "AutoDep: " << p.Name() << std::endl;
+ }
+
+ // init vars
+ follow_recommends = MarkFollowsRecommends();
+ follow_suggests = MarkFollowsSuggests();
+
+
+
+ // do the mark part, this is the core bit of the algorithm
+ for(PkgIterator p = PkgBegin(); !p.end(); ++p)
+ {
+ if(!(PkgState[p->ID].Flags & Flag::Auto) ||
+ (p->Flags & Flag::Essential) ||
+ userFunc.InRootSet(p))
+
+ {
+ // the package is installed (and set to keep)
+ if(PkgState[p->ID].Keep() && !p.CurrentVer().end())
+ MarkPackage(p, p.CurrentVer(),
+ follow_recommends, follow_suggests);
+ // the package is to be installed
+ else if(PkgState[p->ID].Install())
+ MarkPackage(p, PkgState[p->ID].InstVerIter(*this),
+ follow_recommends, follow_suggests);
+ }
+ }
+
+ return true;
+}
+
+// mark a single package in Mark-and-Sweep
+void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
+ const pkgCache::VerIterator &ver,
+ bool follow_recommends,
+ bool follow_suggests)
+{
+ pkgDepCache::StateCache &state = PkgState[pkg->ID];
+ VerIterator candver = state.CandidateVerIter(*this);
+ VerIterator instver = state.InstVerIter(*this);
+
+#if 0
+ // If a package was garbage-collected but is now being marked, we
+ // should re-select it
+ // For cases when a pkg is set to upgrade and this trigger the
+ // removal of a no-longer used dependency. if the pkg is set to
+ // keep again later it will result in broken deps
+ if(state.Delete() && state.RemoveReason = Unused)
+ {
+ if(ver==candver)
+ mark_install(pkg, false, false, NULL);
+ else if(ver==pkg.CurrentVer())
+ MarkKeep(pkg, false, false);
+
+ instver=state.InstVerIter(*this);
+ }
+#endif
+
+ // Ignore versions other than the InstVer, and ignore packages
+ // that are already going to be removed or just left uninstalled.
+ if(!(ver == instver && !instver.end()))
+ return;
+
+ // if we are marked already we are done
+ if(state.Marked)
+ return;
+
+ //std::cout << "Setting Marked for: " << pkg.Name() << std::endl;
+ state.Marked=true;
+
+ if(!ver.end())
+ {
+ for(DepIterator d = ver.DependsList(); !d.end(); ++d)
+ {
+ if(d->Type == Dep::Depends ||
+ d->Type == Dep::PreDepends ||
+ (follow_recommends &&
+ d->Type == Dep::Recommends) ||
+ (follow_suggests &&
+ d->Type == Dep::Suggests))
+ {
+ // Try all versions of this package.
+ for(VerIterator V = d.TargetPkg().VersionList();
+ !V.end(); ++V)
+ {
+ if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
+ {
+ MarkPackage(V.ParentPkg(), V,
+ follow_recommends, follow_suggests);
+ }
+ }
+ // Now try virtual packages
+ for(PrvIterator prv=d.TargetPkg().ProvidesList();
+ !prv.end(); ++prv)
+ {
+ if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp,
+ d.TargetVer()))
+ {
+ MarkPackage(prv.OwnerPkg(), prv.OwnerVer(),
+ follow_recommends, follow_suggests);
+ }
+ }
+ }
+ }
+ }
+}
+
+bool pkgDepCache::Sweep()
+{
+ // do the sweep
+ for(PkgIterator p=PkgBegin(); !p.end(); ++p)
+ {
+ StateCache &state=PkgState[p->ID];
+
+ // if it is not marked and it is installed, it's garbage
+ if(!state.Marked && (!p.CurrentVer().end() || state.Install()) &&
+ !state.Delete())
+ {
+ state.Garbage=true;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::cout << "Garbage: " << p.Name() << std::endl;
+ }
+ }
+
+ return true;
+}
+
// Policy::IsImportantDep - True if the dependency is important /*{{{*/
// ---------------------------------------------------------------------
/* */
bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep)
{
- return Dep.IsCritical();
+ if(Dep.IsCritical())
+ return true;
+ else if(Dep->Type == pkgCache::Dep::Recommends)
+ return _config->FindB("APT::Install-Recommends", false);
+ else if(Dep->Type == pkgCache::Dep::Suggests)
+ return _config->FindB("APT::Install-Suggests", false);
+
+ return false;
}
/*}}}*/
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 6d51920e9..5cd5ea354 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -1,4 +1,4 @@
-// -*- mode: cpp; mode: fold -*-
+// -*- mode: c++; mode: fold -*-
// Description /*{{{*/
// $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
@@ -45,9 +45,71 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/progress.h>
+#include <regex.h>
+
+#include <vector>
+
class pkgDepCache : protected pkgCache::Namespace
{
public:
+
+ /** \brief An arbitrary predicate on packages. */
+ class InRootSetFunc
+ {
+ public:
+ virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;};
+ virtual ~InRootSetFunc() {};
+ };
+
+ private:
+ /** \brief Mark a single package and all its unmarked important
+ * dependencies during mark-and-sweep.
+ *
+ * Recursively invokes itself to mark all dependencies of the
+ * package.
+ *
+ * \param pkg The package to mark.
+ *
+ * \param ver The version of the package that is to be marked.
+ *
+ * \param follow_recommends If \b true, recommendations of the
+ * package will be recursively marked.
+ *
+ * \param follow_suggests If \b true, suggestions of the package
+ * will be recursively marked.
+ */
+ void MarkPackage(const pkgCache::PkgIterator &pkg,
+ const pkgCache::VerIterator &ver,
+ bool follow_recommends,
+ bool follow_suggests);
+
+ /** \brief Update the Marked field of all packages.
+ *
+ * Each package's StateCache::Marked field will be set to \b true
+ * if and only if it can be reached from the root set. By
+ * default, the root set consists of the set of manually installed
+ * or essential packages, but it can be extended using the
+ * parameter #rootFunc.
+ *
+ * \param rootFunc A callback that can be used to add extra
+ * packages to the root set.
+ *
+ * \return \b false if an error occured.
+ */
+ bool MarkRequired(InRootSetFunc &rootFunc);
+
+ /** \brief Set the StateCache::Garbage flag on all packages that
+ * should be removed.
+ *
+ * Packages that were not marked by the last call to #MarkRequired
+ * are tested to see whether they are actually garbage. If so,
+ * they are marked as such.
+ *
+ * \return \b false if an error occured.
+ */
+ bool Sweep();
+
+ public:
// These flags are used in DepState
enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2),
@@ -63,6 +125,84 @@ class pkgDepCache : protected pkgCache::Namespace
enum VersionTypes {NowVersion, InstallVersion, CandidateVersion};
enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2};
+
+ /** \brief Represents an active action group.
+ *
+ * An action group is a group of actions that are currently being
+ * performed. While an active group is active, certain routine
+ * clean-up actions that would normally be performed after every
+ * cache operation are delayed until the action group is
+ * completed. This is necessary primarily to avoid inefficiencies
+ * when modifying a large number of packages at once.
+ *
+ * This class represents an active action group. Creating an
+ * instance will create an action group; destroying one will
+ * destroy the corresponding action group.
+ *
+ * The following operations are suppressed by this class:
+ *
+ * - Keeping the Marked and Garbage flags up to date.
+ *
+ * \note This can be used in the future to easily accumulate
+ * atomic actions for undo or to display "what apt did anyway";
+ * e.g., change the counter of how many action groups are active
+ * to a std::set of pointers to them and use those to store
+ * information about what happened in a group in the group.
+ */
+ class ActionGroup
+ {
+ pkgDepCache &cache;
+
+ bool released;
+
+ /** Action groups are noncopyable. */
+ ActionGroup(const ActionGroup &other);
+ public:
+ /** \brief Create a new ActionGroup.
+ *
+ * \param cache The cache that this ActionGroup should
+ * manipulate.
+ *
+ * As long as this object exists, no automatic cleanup
+ * operations will be undertaken.
+ */
+ ActionGroup(pkgDepCache &cache);
+
+ /** \brief Clean up the action group before it is destroyed.
+ *
+ * If it is destroyed later, no second cleanup wil be run.
+ */
+ void release();
+
+ /** \brief Destroy the action group.
+ *
+ * If this is the last action group, the automatic cache
+ * cleanup operations will be undertaken.
+ */
+ ~ActionGroup();
+ };
+
+ /** \brief Returns \b true for packages matching a regular
+ * expression in APT::NeverAutoRemove.
+ */
+ class DefaultRootSetFunc : public InRootSetFunc
+ {
+ std::vector<regex_t *> rootSetRegexp;
+ bool constructedSuccessfully;
+
+ public:
+ DefaultRootSetFunc();
+ ~DefaultRootSetFunc();
+
+ /** \return \b true if the class initialized successfully, \b
+ * false otherwise. Used to avoid throwing an exception, since
+ * APT classes generally don't.
+ */
+ bool wasConstructedSuccessfully() const { return constructedSuccessfully; }
+
+ bool InRootSet(const pkgCache::PkgIterator &pkg);
+ };
+
struct StateCache
{
// Epoch stripped text versions of the two version fields
@@ -79,6 +219,17 @@ class pkgDepCache : protected pkgCache::Namespace
unsigned short Flags;
unsigned short iFlags; // Internal flags
+ /** \brief \b true if this package can be reached from the root set. */
+ bool Marked;
+
+ /** \brief \b true if this package is unused and should be removed.
+ *
+ * This differs from !#Marked, because it is possible that some
+ * unreachable packages will be protected from becoming
+ * garbage.
+ */
+ bool Garbage;
+
// Various tree indicators
signed char Status; // -1,0,1,2
unsigned char Mode; // ModeList
@@ -97,7 +248,9 @@ class pkgDepCache : protected pkgCache::Namespace
inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
inline bool Held() const {return Status != 0 && Keep();};
inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};
+ inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;};
inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
+ inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};
inline bool Install() const {return Mode == ModeInstall;};
inline VerIterator InstVerIter(pkgCache &Cache)
{return VerIterator(Cache,InstallVer);};
@@ -119,6 +272,14 @@ class pkgDepCache : protected pkgCache::Namespace
virtual ~Policy() {};
};
+
+ private:
+ /** The number of open "action groups"; certain post-action
+ * operations are suppressed if this number is > 0.
+ */
+ int group_level;
+
+ friend class ActionGroup;
protected:
@@ -133,6 +294,7 @@ class pkgDepCache : protected pkgCache::Namespace
unsigned long iDelCount;
unsigned long iKeepCount;
unsigned long iBrokenCount;
+ unsigned long iPolicyBrokenCount;
unsigned long iBadCount;
Policy *delLocalPolicy; // For memory clean up..
@@ -182,16 +344,69 @@ class pkgDepCache : protected pkgCache::Namespace
inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];};
inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];};
- // Manipulators
- void MarkKeep(PkgIterator const &Pkg,bool Soft = false);
+ /** \return A function identifying packages in the root set other
+ * than manually installed packages and essential packages, or \b
+ * NULL if an error occurs.
+ *
+ * \todo Is this the best place for this function? Perhaps the
+ * settings for mark-and-sweep should be stored in a single
+ * external class?
+ */
+ virtual InRootSetFunc *GetRootSetFunc();
+
+ /** \return \b true if the garbage collector should follow recommendations.
+ */
+ virtual bool MarkFollowsRecommends();
+
+ /** \return \b true if the garbage collector should follow suggestions.
+ */
+ virtual bool MarkFollowsSuggests();
+
+ /** \brief Update the Marked and Garbage fields of all packages.
+ *
+ * This routine is implicitly invoked after all state manipulators
+ * and when an ActionGroup is destroyed. It invokes #MarkRequired
+ * and #Sweep to do its dirty work.
+ *
+ * \param rootFunc A predicate that returns \b true for packages
+ * that should be added to the root set.
+ */
+ bool MarkAndSweep(InRootSetFunc &rootFunc)
+ {
+ return MarkRequired(rootFunc) && Sweep();
+ }
+
+ bool MarkAndSweep()
+ {
+ std::auto_ptr<InRootSetFunc> f(GetRootSetFunc());
+ if(f.get() != NULL)
+ return MarkAndSweep(*f.get());
+ else
+ return false;
+ }
+
+ /** \name State Manipulators
+ */
+ // @{
+ void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
+ bool FromUser = true);
void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
- unsigned long Depth = 0);
+ unsigned long Depth = 0, bool FromUser = true,
+ bool ForceImportantDeps = false);
void SetReInstall(PkgIterator const &Pkg,bool To);
void SetCandidateVersion(VerIterator TargetVer);
+
+ /** Set the "is automatically installed" flag of Pkg. */
+ void MarkAuto(const PkgIterator &Pkg, bool Auto);
+ // @}
// This is for debuging
void Update(OpProgress *Prog = 0);
+
+ // read persistent states
+ bool readStateFile(OpProgress *prog);
+ bool writeStateFile(OpProgress *prog);
// Size queries
inline double UsrSize() {return iUsrSize;};
@@ -200,6 +415,7 @@ class pkgDepCache : protected pkgCache::Namespace
inline unsigned long KeepCount() {return iKeepCount;};
inline unsigned long InstCount() {return iInstCount;};
inline unsigned long BrokenCount() {return iBrokenCount;};
+ inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;};
inline unsigned long BadCount() {return iBadCount;};
bool Init(OpProgress *Prog);
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 6118845e8..579a19ab9 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: init.cc,v 1.21 2004/02/27 00:46:44 mdz Exp $
+// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $
/* ######################################################################
Init - Initialize the package library
@@ -40,6 +40,8 @@ bool pkgInitConfig(Configuration &Cnf)
else
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
Cnf.Set("APT::Build-Essential::", "build-essential");
+ Cnf.Set("APT::Install-Recommends", false);
+ Cnf.Set("APT::Install-Suggests", false);
Cnf.Set("Dir","/");
// State
@@ -64,13 +66,14 @@ bool pkgInitConfig(Configuration &Cnf)
// Configuration
Cnf.Set("Dir::Etc","etc/apt/");
Cnf.Set("Dir::Etc::sourcelist","sources.list");
+ Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-
+
bool Res = true;
// Read an alternate config file
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index e21351797..b036b8609 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,7 +18,7 @@
// See the makefile
#define APT_PKG_MAJOR 3
-#define APT_PKG_MINOR 10
+#define APT_PKG_MINOR 51
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 0e6aecc65..6cc1414b2 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.11
+MAJOR=3.51
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
@@ -21,11 +21,11 @@ APT_DOMAIN:=libapt-pkg$(MAJOR)
# Source code for the contributed non-core things
SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
- contrib/md5.cc contrib/sha1.cc contrib/hashes.cc \
+ contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
contrib/cdromutl.cc contrib/crc-16.cc \
contrib/fileutl.cc
HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \
- md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h
+ md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 155408bb4..b0dd43629 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -106,7 +106,7 @@ bool pkgPackageManager::FixMissing()
// Okay, this file is missing and we need it. Mark it for keep
Bad = true;
- Cache.MarkKeep(I);
+ Cache.MarkKeep(I, false, false);
}
// We have to empty the list otherwise it will not have the new changes
@@ -593,7 +593,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
{
- _error->Error("Internal Error, trying to manipulate a kept package");
+ _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());
return Failed;
}
@@ -631,12 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
DepCache to perform the installation of packages.*/
-pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
{
- OrderResult Res = OrderInstall();
- if (Res != Failed)
- if (Go(status_fd) == false)
- return Failed;
- return Res;
+ if(DoInstallPreFork() == Failed)
+ return Failed;
+
+ return DoInstallPostFork(statusFd);
}
/*}}}*/
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index f64637d03..48f53576c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -28,7 +28,9 @@
#endif
#include <string>
+#include <iostream>
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/depcache.h>
using std::string;
@@ -70,13 +72,39 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
virtual bool Go(int statusFd=-1) {return true;};
virtual void Reset() {};
-
+
+ // the result of the operation
+ OrderResult Res;
+
public:
// Main action members
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
- OrderResult DoInstall(int statusFd=-1);
+
+ // Do the installation
+ OrderResult DoInstall(int statusFd=-1);
+
+ // stuff that needs to be done before the fork() of a library that
+ // uses apt
+ OrderResult DoInstallPreFork() {
+ Res = OrderInstall();
+ return Res;
+ };
+
+ // stuff that needs to be done after the fork
+ OrderResult DoInstallPostFork(int statusFd=-1) {
+ bool goResult = Go(statusFd);
+ if(goResult == false)
+ return Failed;
+
+ // if all was fine update the state file
+ if(Res == Completed) {
+ Cache.writeStateFile(NULL);
+ }
+ return Res;
+ };
+
bool FixMissing();
pkgPackageManager(pkgDepCache *Cache);
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 4452079a2..162ab4f27 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -164,7 +164,7 @@ bool pkgCache::ReMap()
/* This is used to generate the hash entries for the HashTable. With my
package list from bo this function gets 94% table usage on a 512 item
table (480 used items) */
-unsigned long pkgCache::sHash(string Str) const
+unsigned long pkgCache::sHash(const string &Str) const
{
unsigned long Hash = 0;
for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
@@ -184,7 +184,7 @@ unsigned long pkgCache::sHash(const char *Str) const
// Cache::FindPkg - Locate a package by name /*{{{*/
// ---------------------------------------------------------------------
/* Returns 0 on error, pointer to the package otherwise */
-pkgCache::PkgIterator pkgCache::FindPkg(string Name)
+pkgCache::PkgIterator pkgCache::FindPkg(const string &Name)
{
// Look at the hash bucket
Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)];
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 6a54ad5ba..c7a3172cc 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -95,7 +95,7 @@ class pkgCache
string CacheFile;
MMap &Map;
- unsigned long sHash(string S) const;
+ unsigned long sHash(const string &S) const;
unsigned long sHash(const char *S) const;
public:
@@ -119,14 +119,14 @@ class pkgCache
inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
// String hashing function (512 range)
- inline unsigned long Hash(string S) const {return sHash(S);};
+ inline unsigned long Hash(const string &S) const {return sHash(S);};
inline unsigned long Hash(const char *S) const {return sHash(S);};
// Usefull transformation things
const char *Priority(unsigned char Priority);
// Accessors
- PkgIterator FindPkg(string Name);
+ PkgIterator FindPkg(const string &Name);
Header &Head() {return *HeaderP;};
inline PkgIterator PkgBegin();
inline PkgIterator PkgEnd();
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 1ba791b45..b2725a99d 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -26,6 +26,8 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/tagfile.h>
+
#include <apti18n.h>
#include <vector>
@@ -315,7 +317,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
// CacheGenerator::NewPackage - Add a new package /*{{{*/
// ---------------------------------------------------------------------
/* This creates a new package structure and adds it to the hash table */
-bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name)
+bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name)
{
Pkg = Cache.FindPkg(Name);
if (Pkg.end() == false)
@@ -379,7 +381,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
// ---------------------------------------------------------------------
/* This puts a version structure in the linked list */
unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
- string VerStr,
+ const string &VerStr,
unsigned long Next)
{
// Get a structure
@@ -459,8 +461,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
/* This creates a dependency element in the tree. It is linked to the
version and to the package that it is pointing to. */
bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
- string PackageName,
- string Version,
+ const string &PackageName,
+ const string &Version,
unsigned int Op,
unsigned int Type)
{
@@ -524,8 +526,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
// ---------------------------------------------------------------------
/* */
bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
- string PackageName,
- string Version)
+ const string &PackageName,
+ const string &Version)
{
pkgCache &Cache = Owner->Cache;
@@ -564,7 +566,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
// ---------------------------------------------------------------------
/* This is used to select which file is to be associated with all newly
added versions. The caller is responsible for setting the IMS fields. */
-bool pkgCacheGenerator::SelectFile(string File,string Site,
+bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
const pkgIndexFile &Index,
unsigned long Flags)
{
@@ -648,7 +650,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
/* This just verifies that each file in the list of index files exists,
has matching attributes with the cache and the cache does not have
any extra files. */
-static bool CheckValidity(string CacheFile, FileIterator Start,
+static bool CheckValidity(const string &CacheFile, FileIterator Start,
FileIterator End,MMap **OutMap = 0)
{
// No file, certainly invalid
@@ -676,8 +678,10 @@ static bool CheckValidity(string CacheFile, FileIterator Start,
if ((*Start)->Exists() == false)
{
+#if 0 // mvo: we no longer give a message here (Default Sources spec)
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
+#endif
continue;
}
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 6ab8594d9..fae1a60a6 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -54,19 +54,19 @@ class pkgCacheGenerator
// Flag file dependencies
bool FoundFileDeps;
- bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+ bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
- unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
public:
unsigned long WriteUniqString(const char *S,unsigned int Size);
- inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
+ inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());};
void DropProgress() {Progress = 0;};
- bool SelectFile(string File,string Site,pkgIndexFile const &Index,
+ bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,
unsigned long Flags = 0);
bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
inline pkgCache &GetCache() {return Cache;};
@@ -97,12 +97,13 @@ class pkgCacheGenerator::ListParser
inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
- inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
+ inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);};
inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
- bool NewDepends(pkgCache::VerIterator Ver,string Package,
- string Version,unsigned int Op,
+ bool NewDepends(pkgCache::VerIterator Ver,const string &Package,
+ const string &Version,unsigned int Op,
unsigned int Type);
- bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+ bool NewProvides(pkgCache::VerIterator Ver,const string &Package,
+ const string &Version);
public:
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index f62f945b5..b22f3e73f 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
if (Files[I->ID] == 0)
return;
}
- // We store that to make sure that the destructor won't segfault,
- // even if the Cache object was destructed before this instance.
- PackageFileCount = Cache.HeaderP->PackageFileCount;
}
/*}}}*/
// Records::~pkgRecords - Destructor /*{{{*/
@@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
/* */
pkgRecords::~pkgRecords()
{
- for (unsigned I = 0; I != PackageFileCount; I++)
+ for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
delete Files[I];
delete [] Files;
}
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index ece91680e..31c444dbf 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -33,7 +33,6 @@ class pkgRecords
pkgCache &Cache;
Parser **Files;
- int PackageFileCount;
public:
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 95aba0cb5..e3b4d94f8 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: sourcelist.cc,v 1.25 2004/06/07 23:08:00 mdz Exp $
+// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $
/* ######################################################################
List of Sources
@@ -21,6 +21,13 @@
#include <apti18n.h>
#include <fstream>
+
+// CNC:2003-03-03 - This is needed for ReadDir stuff.
+#include <algorithm>
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
/*}}}*/
using namespace std;
@@ -142,23 +149,66 @@ pkgSourceList::~pkgSourceList()
/* */
bool pkgSourceList::ReadMainList()
{
- return Read(_config->FindFile("Dir::Etc::sourcelist"));
+ // CNC:2003-03-03 - Multiple sources list support.
+ bool Res = true;
+#if 0
+ Res = ReadVendors();
+ if (Res == false)
+ return false;
+#endif
+
+ Reset();
+ // CNC:2003-11-28 - Entries in sources.list have priority over
+ // entries in sources.list.d.
+ string Main = _config->FindFile("Dir::Etc::sourcelist");
+ if (FileExists(Main) == true)
+ Res &= ReadAppend(Main);
+
+ string Parts = _config->FindDir("Dir::Etc::sourceparts");
+ if (FileExists(Parts) == true)
+ Res &= ReadSourceDir(Parts);
+
+ return Res;
}
/*}}}*/
+// CNC:2003-03-03 - Needed to preserve backwards compatibility.
+// SourceList::Reset - Clear the sourcelist contents /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgSourceList::Reset()
+{
+ for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
+ delete *I;
+ SrcList.erase(SrcList.begin(),SrcList.end());
+}
+ /*}}}*/
+// CNC:2003-03-03 - Function moved to ReadAppend() and Reset().
// SourceList::Read - Parse the sourcelist file /*{{{*/
// ---------------------------------------------------------------------
/* */
bool pkgSourceList::Read(string File)
{
+ Reset();
+ return ReadAppend(File);
+}
+ /*}}}*/
+// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadAppend(string File)
+{
// Open the stream for reading
ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
if (!F != 0)
return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
+#if 0 // Now Reset() does this.
for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
delete *I;
SrcList.erase(SrcList.begin(),SrcList.end());
- char Buffer[300];
+#endif
+ // CNC:2003-12-10 - 300 is too short.
+ char Buffer[1024];
int CurLine = 0;
while (F.eof() == false)
@@ -172,7 +222,10 @@ bool pkgSourceList::Read(string File)
char *I;
- for (I = Buffer; *I != 0 && *I != '#'; I++);
+ // CNC:2003-02-20 - Do not break if '#' is inside [].
+ for (I = Buffer; *I != 0 && *I != '#'; I++)
+ if (*I == '[')
+ for (I++; *I != 0 && *I != ']'; I++);
*I = 0;
const char *C = _strstrip(Buffer);
@@ -259,3 +312,55 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
return true;
}
/*}}}*/
+// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>.
+// SourceList::ReadSourceDir - Read a directory with sources files
+// Based on ReadConfigDir() /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ReadSourceDir(string Dir)
+{
+ DIR *D = opendir(Dir.c_str());
+ if (D == 0)
+ return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
+ vector<string> List;
+
+ for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
+ {
+ if (Ent->d_name[0] == '.')
+ continue;
+
+ // CNC:2003-12-02 Only accept .list files as valid sourceparts
+ if (flExtension(Ent->d_name) != "list")
+ continue;
+
+ // Skip bad file names ala run-parts
+ const char *C = Ent->d_name;
+ for (; *C != 0; C++)
+ if (isalpha(*C) == 0 && isdigit(*C) == 0
+ && *C != '_' && *C != '-' && *C != '.')
+ break;
+ if (*C != 0)
+ continue;
+
+ // Make sure it is a file and not something else
+ string File = flCombine(Dir,Ent->d_name);
+ struct stat St;
+ if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
+ continue;
+
+ List.push_back(File);
+ }
+ closedir(D);
+
+ sort(List.begin(),List.end());
+
+ // Read the files
+ for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+ if (ReadAppend(*I) == false)
+ return false;
+ return true;
+
+}
+ /*}}}*/
+
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 5d8427017..123ae6984 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -77,6 +77,11 @@ class pkgSourceList
bool ReadMainList();
bool Read(string File);
+
+ // CNC:2003-03-03
+ void Reset();
+ bool ReadAppend(string File);
+ bool ReadSourceDir(string Dir);
// List accessors
inline const_iterator begin() const {return SrcList.begin();};
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index cae0fa819..8fcbeb23b 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -33,22 +33,33 @@ using std::string;
/* */
pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
Fd(*pFd),
- Size(Size)
+ Size(Size),
+ Map(NULL),
+ Buffer(0)
{
if (Fd.IsOpen() == false)
{
- Buffer = 0;
Start = End = Buffer = 0;
Done = true;
iOffset = 0;
+ Map = NULL;
return;
}
- Buffer = new char[Size];
- Start = End = Buffer;
- Done = false;
+ // check if we can MMap it
+ if(Fd.Size() == 0)
+ {
+ Buffer = new char[Size];
+ Start = End = Buffer;
+ Done = false;
+ Fill();
+ } else {
+ Map = new MMap (Fd, MMap::Public | MMap::ReadOnly);
+ Buffer = (char *) Map->Data ();
+ Start = Buffer;
+ End = Buffer + Map->Size ();
+ }
iOffset = 0;
- Fill();
}
/*}}}*/
// TagFile::~pkgTagFile - Destructor /*{{{*/
@@ -56,7 +67,8 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
/* */
pkgTagFile::~pkgTagFile()
{
- delete [] Buffer;
+ if(!Map) delete [] Buffer;
+ delete Map;
}
/*}}}*/
// TagFile::Step - Advance to the next section /*{{{*/
@@ -64,8 +76,15 @@ pkgTagFile::~pkgTagFile()
/* If the Section Scanner fails we refill the buffer and try again. */
bool pkgTagFile::Step(pkgTagSection &Tag)
{
+ if ((Map != NULL) && (Start == End))
+ return false;
+
if (Tag.Scan(Start,End - Start) == false)
{
+ if (Map != NULL)
+ return _error->Error(_("Unable to parse package file %s (1)"),
+ Fd.Name().c_str());
+
if (Fill() == false)
return false;
@@ -139,23 +158,30 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
return Step(Tag);
}
- // Reposition and reload..
iOffset = Offset;
- Done = false;
- if (Fd.Seek(Offset) == false)
- return false;
- End = Start = Buffer;
+ if (Map != NULL)
+ {
+ Start = Buffer + iOffset;
+ }
+ else
+ {
+ // Reposition and reload..
+ Done = false;
+ if (Fd.Seek(Offset) == false)
+ return false;
+ End = Start = Buffer;
- if (Fill() == false)
- return false;
+ if (Fill() == false)
+ return false;
- if (Tag.Scan(Start,End - Start) == true)
- return true;
-
- // This appends a double new line (for the real eof handling)
- if (Fill() == false)
- return false;
+ if (Tag.Scan(Start,End - Start) == true)
+ return true;
+ // This appends a double new line (for the real eof handling)
+ if (Fill() == false)
+ return false;
+ }
+
if (Tag.Scan(Start,End - Start) == false)
return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
@@ -181,7 +207,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
Stop = Section = Start;
memset(AlphaIndexes,0,sizeof(AlphaIndexes));
- if (Stop == 0)
+ if (Stop == 0 || MaxLength == 0)
return false;
TagCount = 0;
@@ -212,6 +238,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
Stop++;
}
+ if ((Stop+1 >= End) && (End[-1] == '\n' || End[-1] == '\r'))
+ {
+ Indexes[TagCount] = (End - 1) - Section;
+ return true;
+ }
+
return false;
}
/*}}}*/
@@ -394,7 +426,8 @@ static const char *iTFRewritePackageOrder[] = {
"Filename",
"Size",
"MD5Sum",
- "SHA1Sum",
+ "SHA1",
+ "SHA256",
"MSDOS-Filename", // Obsolete
"Description",
0};
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 8c948754d..dd481ba51 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -25,6 +25,7 @@
#endif
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/mmap.h>
#include <stdio.h>
class pkgTagSection
@@ -69,6 +70,7 @@ class pkgTagSection
class pkgTagFile
{
FileFd &Fd;
+ MMap *Map;
char *Buffer;
char *Start;
char *End;
@@ -84,7 +86,7 @@ class pkgTagFile
inline unsigned long Offset() {return iOffset;};
bool Jump(pkgTagSection &Tag,unsigned long Offset);
- pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
+ pkgTagFile(FileFd *F,unsigned long Size = 64*1024);
~pkgTagFile();
};
diff --git a/buildlib/archtable b/buildlib/archtable
index b01743c02..197529202 100644
--- a/buildlib/archtable
+++ b/buildlib/archtable
@@ -11,6 +11,7 @@ sparc sparc
sparc64 sparc
alpha.* alpha
m68k m68k
+arm.*b armeb
arm.* arm
powerpc powerpc
ppc powerpc
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index c3d08d9d4..a171522d5 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1)
PARALLEL_RUN=no
endif
-ifndef PARALLEL_RUN
- PARALLEL_RUN=yes
- .EXPORT: PARALLEL_RUN
- # handle recursion
- ifneq ($(NUM_PROCS),)
- MAKEFLAGS += -j $(NUM_PROCS)
- endif
-endif
+# mvo: commented out, lead to build failures in the arch-build target
+#ifndef PARALLEL_RUN
+# PARALLEL_RUN=yes
+# .EXPORT: PARALLEL_RUN
+# # handle recursion
+# ifneq ($(NUM_PROCS),)
+# MAKEFLAGS += -j $(NUM_PROCS)
+# endif
+#endif
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index e1ae0c805..511a5cae2 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
(echo $(SRC) | xargs -n1 echo) > $@
-binary program: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
veryclean: veryclean/$(LOCAL)
veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
diff --git a/buildlib/sizetable b/buildlib/sizetable
index 911180145..8b18528cf 100644
--- a/buildlib/sizetable
+++ b/buildlib/sizetable
@@ -11,6 +11,7 @@
# The format is:-
# CPU endian sizeof: char, int, short, long
i386 little 1 4 2 4
+armeb big 1 4 2 4
arm little 1 4 2 4
alpha little 1 4 2 8
mipsel little 1 4 2 4
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index cb1aeb514..74fa71cba 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1630,10 +1630,11 @@ bool Madison(CommandLine &CmdL)
pkgCache &Cache = *GCache;
- // Create the text record parsers
+ // Create the src text record parsers and ignore errors about missing
+ // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
pkgSrcRecords SrcRecs(*SrcList);
if (_error->PendingError() == true)
- return false;
+ _error->Discard();
for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3475d79ae..96e974acb 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -38,6 +38,7 @@
#include <apt-pkg/version.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/sptr.h>
+#include <apt-pkg/md5.h>
#include <apt-pkg/versionmatch.h>
#include <config.h>
@@ -45,6 +46,7 @@
#include "acqprogress.h"
+#include <set>
#include <locale.h>
#include <langinfo.h>
#include <fstream>
@@ -58,6 +60,7 @@
#include <errno.h>
#include <regex.h>
#include <sys/wait.h>
+#include <sstream>
/*}}}*/
using namespace std;
@@ -626,6 +629,8 @@ void CacheFile::Sort()
and verifies that the system is OK. */
bool CacheFile::CheckDeps(bool AllowBroken)
{
+ bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false);
+
if (_error->PendingError() == true)
return false;
@@ -637,12 +642,24 @@ bool CacheFile::CheckDeps(bool AllowBroken)
if (pkgApplyStatus(*DCache) == false)
return false;
+ if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true)
+ {
+ FixBroken = true;
+ if ((DCache->PolicyBrokenCount() > 0))
+ {
+ // upgrade all policy-broken packages with ForceImportantDeps=True
+ for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++)
+ if ((*DCache)[I].NowPolicyBroken() == true)
+ DCache->MarkInstall(I,true,0,true);
+ }
+ }
+
// Nothing is broken
if (DCache->BrokenCount() == 0 || AllowBroken == true)
return true;
// Attempt to fix broken things
- if (_config->FindB("APT::Get::Fix-Broken",false) == true)
+ if (FixBroken == true)
{
c1out << _("Correcting dependencies...") << flush;
if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0)
@@ -993,7 +1010,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
cerr << _("Unable to correct missing packages.") << endl;
return _error->Error(_("Aborting install."));
}
-
+
_system->UnLock();
int status_fd = _config->FindI("APT::Status-Fd",-1);
pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd);
@@ -1143,9 +1160,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
else
ExpectedInst++;
- // Install it with autoinstalling enabled.
- if (State.InstBroken() == true && BrokenFix == false)
+ // Install it with autoinstalling enabled (if we not respect the minial
+ // required deps or the policy)
+ if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false)
Cache.MarkInstall(Pkg,true);
+
return true;
}
/*}}}*/
@@ -1200,7 +1219,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
}
- else if(DefRel.empty() == false)
+ else if(!Pkg.end() && DefRel.empty() == false)
{
// we have a default release, try to locate the pkg. we do it like
// this because GetCandidateVer() will not "downgrade", that means
@@ -1353,20 +1372,29 @@ bool DoUpdate(CommandLine &CmdL)
return false;
bool Failed = false;
+ bool TransientNetworkFailure = false;
for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
{
if ((*I)->Status == pkgAcquire::Item::StatDone)
continue;
(*I)->Finished();
-
+
fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(),
(*I)->ErrorText.c_str());
+
+ if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError)
+ {
+ TransientNetworkFailure = true;
+ continue;
+ }
+
Failed = true;
}
// Clean out any old list files
- if (_config->FindB("APT::Get::List-Cleanup",true) == true)
+ if (!TransientNetworkFailure &&
+ _config->FindB("APT::Get::List-Cleanup",true) == true)
{
if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
@@ -1378,12 +1406,60 @@ bool DoUpdate(CommandLine &CmdL)
if (Cache.BuildCaches() == false)
return false;
- if (Failed == true)
+ if (TransientNetworkFailure == true)
+ _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+ else if (Failed == true)
return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
-
+
return true;
}
/*}}}*/
+// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/
+// ---------------------------------------------------------------------
+/* Remove unused automatic packages */
+bool DoAutomaticRemove(CacheFile &Cache)
+{
+ if(_config->FindI("Debug::pkgAutoRemove",false))
+ std::cout << "DoAutomaticRemove()" << std::endl;
+
+ if (_config->FindB("APT::Get::Remove",true) == false)
+ return _error->Error(_("We are not supposed to delete stuff, can't "
+ "start AutoRemover"));
+
+ {
+ pkgDepCache::ActionGroup group(*Cache);
+
+ // look over the cache to see what can be removed
+ for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
+ {
+ if (Cache[Pkg].Garbage)
+ {
+ if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
+ fprintf(stdout,"We could delete %s\n", Pkg.Name());
+
+ if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles)
+ Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false));
+ else
+ Cache->MarkKeep(Pkg, false, false);
+ }
+ }
+ }
+
+ // Now see if we destroyed anything
+ if (Cache->BrokenCount() != 0)
+ {
+ c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n"
+ "shouldn't happen. Please file a bug report against apt.") << endl;
+ c1out << endl;
+ c1out << _("The following information may help to resolve the situation:") << endl;
+ c1out << endl;
+ ShowBroken(c1out,Cache,false);
+
+ return _error->Error(_("Internal Error, AutoRemover broke stuff"));
+ }
+ return true;
+}
+
// DoUpgrade - Upgrade all packages /*{{{*/
// ---------------------------------------------------------------------
/* Upgrade all packages without installing new packages or erasing old
@@ -1409,15 +1485,6 @@ bool DoUpgrade(CommandLine &CmdL)
/* Install named packages */
bool DoInstall(CommandLine &CmdL)
{
- // Lock the list directory
- FileFd Lock;
- if (_config->FindB("Debug::NoLocking",false) == false)
- {
- Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
- if (_error->PendingError() == true)
- return _error->Error(_("Unable to lock the list directory"));
- }
-
CacheFile Cache;
if (Cache.OpenForInstall() == false ||
Cache.CheckDeps(CmdL.FileSize() != 1) == false)
@@ -1435,155 +1502,168 @@ bool DoInstall(CommandLine &CmdL)
bool DefRemove = false;
if (strcasecmp(CmdL.FileList[0],"remove") == 0)
DefRemove = true;
+ else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0)
+ {
+ _config->Set("APT::Get::AutomaticRemove", "true");
+ DefRemove = true;
+ }
- for (const char **I = CmdL.FileList + 1; *I != 0; I++)
+ // new scope for the ActionGroup
{
- // Duplicate the string
- unsigned int Length = strlen(*I);
- char S[300];
- if (Length >= sizeof(S))
- continue;
- strcpy(S,*I);
-
- // See if we are removing and special indicators..
- bool Remove = DefRemove;
- char *VerTag = 0;
- bool VerIsRel = false;
- while (Cache->FindPkg(S).end() == true)
+ pkgDepCache::ActionGroup group(Cache);
+ for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{
- // Handle an optional end tag indicating what to do
- if (Length >= 1 && S[Length - 1] == '-')
- {
- Remove = true;
- S[--Length] = 0;
+ // Duplicate the string
+ unsigned int Length = strlen(*I);
+ char S[300];
+ if (Length >= sizeof(S))
continue;
- }
-
- if (Length >= 1 && S[Length - 1] == '+')
+ strcpy(S,*I);
+
+ // See if we are removing and special indicators..
+ bool Remove = DefRemove;
+ char *VerTag = 0;
+ bool VerIsRel = false;
+ while (Cache->FindPkg(S).end() == true)
{
- Remove = false;
- S[--Length] = 0;
- continue;
- }
+ // Handle an optional end tag indicating what to do
+ if (Length >= 1 && S[Length - 1] == '-')
+ {
+ Remove = true;
+ S[--Length] = 0;
+ continue;
+ }
- char *Slash = strchr(S,'=');
- if (Slash != 0)
- {
- VerIsRel = false;
- *Slash = 0;
- VerTag = Slash + 1;
- }
+ if (Length >= 1 && S[Length - 1] == '+')
+ {
+ Remove = false;
+ S[--Length] = 0;
+ continue;
+ }
- Slash = strchr(S,'/');
- if (Slash != 0)
- {
- VerIsRel = true;
- *Slash = 0;
- VerTag = Slash + 1;
- }
+ char *Slash = strchr(S,'=');
+ if (Slash != 0)
+ {
+ VerIsRel = false;
+ *Slash = 0;
+ VerTag = Slash + 1;
+ }
- break;
- }
-
- // Locate the package
- pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
- Packages++;
- if (Pkg.end() == true)
- {
- // Check if the name is a regex
- const char *I;
- for (I = S; *I != 0; I++)
- if (*I == '?' || *I == '*' || *I == '|' ||
- *I == '[' || *I == '^' || *I == '$')
- break;
- if (*I == 0)
- return _error->Error(_("Couldn't find package %s"),S);
-
- // Regexs must always be confirmed
- ExpectedInst += 1000;
+ Slash = strchr(S,'/');
+ if (Slash != 0)
+ {
+ VerIsRel = true;
+ *Slash = 0;
+ VerTag = Slash + 1;
+ }
- // Compile the regex pattern
- regex_t Pattern;
- int Res;
- if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
- REG_NOSUB)) != 0)
- {
- char Error[300];
- regerror(Res,&Pattern,Error,sizeof(Error));
- return _error->Error(_("Regex compilation error - %s"),Error);
+ break;
}
-
- // Run over the matches
- bool Hit = false;
- for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
+
+ // Locate the package
+ pkgCache::PkgIterator Pkg = Cache->FindPkg(S);
+ Packages++;
+ if (Pkg.end() == true)
{
- if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
- continue;
+ // Check if the name is a regex
+ const char *I;
+ for (I = S; *I != 0; I++)
+ if (*I == '?' || *I == '*' || *I == '|' ||
+ *I == '[' || *I == '^' || *I == '$')
+ break;
+ if (*I == 0)
+ return _error->Error(_("Couldn't find package %s"),S);
+
+ // Regexs must always be confirmed
+ ExpectedInst += 1000;
+
+ // Compile the regex pattern
+ regex_t Pattern;
+ int Res;
+ if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
+ REG_NOSUB)) != 0)
+ {
+ char Error[300];
+ regerror(Res,&Pattern,Error,sizeof(Error));
+ return _error->Error(_("Regex compilation error - %s"),Error);
+ }
+
+ // Run over the matches
+ bool Hit = false;
+ for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
+ {
+ if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
+ continue;
+
+ ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
+ Pkg.Name(),S);
- ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
- Pkg.Name(),S);
+ if (VerTag != 0)
+ if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
+ return false;
+ Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
+ ExpectedInst,false);
+ }
+ regfree(&Pattern);
+
+ if (Hit == false)
+ return _error->Error(_("Couldn't find package %s"),S);
+ }
+ else
+ {
if (VerTag != 0)
if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
return false;
-
- Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,
- ExpectedInst,false);
- }
- regfree(&Pattern);
-
- if (Hit == false)
- return _error->Error(_("Couldn't find package %s"),S);
- }
- else
- {
- if (VerTag != 0)
- if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
+ if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
return false;
- if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false)
- return false;
- }
- }
+ }
+ }
- /* If we are in the Broken fixing mode we do not attempt to fix the
- problems. This is if the user invoked install without -f and gave
- packages */
- if (BrokenFix == true && Cache->BrokenCount() != 0)
- {
- c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
- ShowBroken(c1out,Cache,false);
+ /* If we are in the Broken fixing mode we do not attempt to fix the
+ problems. This is if the user invoked install without -f and gave
+ packages */
+ if (BrokenFix == true && Cache->BrokenCount() != 0)
+ {
+ c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
+ ShowBroken(c1out,Cache,false);
- return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
- }
+ return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
+ }
- // Call the scored problem resolver
- Fix.InstallProtect();
- if (Fix.Resolve(true) == false)
- _error->Discard();
+ // Call the scored problem resolver
+ Fix.InstallProtect();
+ if (Fix.Resolve(true) == false)
+ _error->Discard();
- // Now we check the state of the packages,
- if (Cache->BrokenCount() != 0)
- {
- c1out <<
- _("Some packages could not be installed. This may mean that you have\n"
- "requested an impossible situation or if you are using the unstable\n"
- "distribution that some required packages have not yet been created\n"
- "or been moved out of Incoming.") << endl;
- if (Packages == 1)
+ // Now we check the state of the packages,
+ if (Cache->BrokenCount() != 0)
{
- c1out << endl;
c1out <<
- _("Since you only requested a single operation it is extremely likely that\n"
- "the package is simply not installable and a bug report against\n"
- "that package should be filed.") << endl;
- }
+ _("Some packages could not be installed. This may mean that you have\n"
+ "requested an impossible situation or if you are using the unstable\n"
+ "distribution that some required packages have not yet been created\n"
+ "or been moved out of Incoming.") << endl;
+ if (Packages == 1)
+ {
+ c1out << endl;
+ c1out <<
+ _("Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+ "that package should be filed.") << endl;
+ }
+
+ c1out << _("The following information may help to resolve the situation:") << endl;
+ c1out << endl;
+ ShowBroken(c1out,Cache,false);
+ return _error->Error(_("Broken packages"));
+ }
+ }
+ if (_config->FindB("APT::Get::AutomaticRemove")) {
+ if (!DoAutomaticRemove(Cache))
+ return false;
+ }
- c1out << _("The following information may help to resolve the situation:") << endl;
- c1out << endl;
- ShowBroken(c1out,Cache,false);
- return _error->Error(_("Broken packages"));
- }
-
/* Print out a list of packages that are going to be installed extra
to what the user asked */
if (Cache->InstCount() != ExpectedInst)
@@ -1603,8 +1683,8 @@ bool DoInstall(CommandLine &CmdL)
if (*J == 0) {
List += string(I.Name()) + " ";
- VersionsList += string(Cache[I].CandVersion) + "\n";
- }
+ VersionsList += string(Cache[I].CandVersion) + "\n";
+ }
}
ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
@@ -1616,68 +1696,86 @@ bool DoInstall(CommandLine &CmdL)
string SuggestsVersions, RecommendsVersions;
for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
{
- pkgCache::PkgIterator I(Cache,Cache.List[J]);
+ pkgCache::PkgIterator Pkg(Cache,Cache.List[J]);
/* Just look at the ones we want to install */
- if ((*Cache)[I].Install() == false)
+ if ((*Cache)[Pkg].Install() == false)
continue;
- for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++)
- {
- for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; )
- {
- pkgCache::DepIterator Start;
- pkgCache::DepIterator End;
- D.GlobOr(Start,End); // advances D
-
- /*
- * If this is a virtual package, we need to check the list of
- * packages that provide it and see if any of those are
- * installed
- */
-
- bool providedBySomething = false;
- for (pkgCache::PrvIterator Prv = Start.TargetPkg().ProvidesList();
- Prv.end() != true;
- Prv++)
- if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
- {
- providedBySomething = true;
- break;
- }
-
- if (providedBySomething) continue;
-
- for(;;)
- {
- /* Skip if package is installed already, or is about to be */
- string target = string(Start.TargetPkg().Name()) + " ";
-
- if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
- || Cache[Start.TargetPkg()].Install())
- break;
-
- /* Skip if we already saw it */
- if (int(SuggestsList.find(target)) != -1 || int(RecommendsList.find(target)) != -1)
- break;
-
- if (Start->Type == pkgCache::Dep::Suggests) {
- SuggestsList += target;
- SuggestsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
- }
-
- if (Start->Type == pkgCache::Dep::Recommends) {
- RecommendsList += target;
- RecommendsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
- }
-
- if (Start >= End)
- break;
- Start++;
- }
- }
- }
+ // get the recommends/suggests for the candidate ver
+ pkgCache::VerIterator CV = (*Cache)[Pkg].CandidateVerIter(*Cache);
+ for (pkgCache::DepIterator D = CV.DependsList(); D.end() == false; )
+ {
+ pkgCache::DepIterator Start;
+ pkgCache::DepIterator End;
+ D.GlobOr(Start,End); // advances D
+
+ // FIXME: we really should display a or-group as a or-group to the user
+ // the problem is that ShowList is incapable of doing this
+ string RecommendsOrList,RecommendsOrVersions;
+ string SuggestsOrList,SuggestsOrVersions;
+ bool foundInstalledInOrGroup = false;
+ for(;;)
+ {
+ /* Skip if package is installed already, or is about to be */
+ string target = string(Start.TargetPkg().Name()) + " ";
+
+ if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
+ || Cache[Start.TargetPkg()].Install())
+ {
+ foundInstalledInOrGroup=true;
+ break;
+ }
+
+ /* Skip if we already saw it */
+ if (int(SuggestsList.find(target)) != -1 || int(RecommendsList.find(target)) != -1)
+ {
+ foundInstalledInOrGroup=true;
+ break;
+ }
+
+ // this is a dep on a virtual pkg, check if any package that provides it
+ // should be installed
+ if(Start.TargetPkg().ProvidesList() != 0)
+ {
+ pkgCache::PrvIterator I = Start.TargetPkg().ProvidesList();
+ for (; I.end() == false; I++)
+ {
+ pkgCache::PkgIterator Pkg = I.OwnerPkg();
+ if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer() &&
+ Pkg.CurrentVer() != 0)
+ foundInstalledInOrGroup=true;
+ }
+ }
+
+ if (Start->Type == pkgCache::Dep::Suggests)
+ {
+ SuggestsOrList += target;
+ SuggestsOrVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
+ }
+
+ if (Start->Type == pkgCache::Dep::Recommends)
+ {
+ RecommendsOrList += target;
+ RecommendsOrVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
+ }
+
+ if (Start >= End)
+ break;
+ Start++;
+ }
+
+ if(foundInstalledInOrGroup == false)
+ {
+ RecommendsList += RecommendsOrList;
+ RecommendsVersions += RecommendsOrVersions;
+ SuggestsList += SuggestsOrList;
+ SuggestsVersions += SuggestsOrVersions;
+ }
+
+ }
}
+
ShowList(c1out,_("Suggested packages:"),SuggestsList,SuggestsVersions);
ShowList(c1out,_("Recommended packages:"),RecommendsList,RecommendsVersions);
@@ -1721,6 +1819,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
return false;
+ pkgDepCache::ActionGroup group(Cache);
+
// Install everything with the install flag set
pkgCache::PkgIterator I = Cache->PkgBegin();
for (;I.end() != true; I++)
@@ -1899,6 +1999,9 @@ bool DoSource(CommandLine &CmdL)
DscFile *Dsc = new DscFile[CmdL.FileSize()];
+ // insert all downloaded uris into this set to avoid downloading them
+ // twice
+ set<string> queued;
// Load the requestd sources into the fetcher
unsigned J = 0;
for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
@@ -1935,7 +2038,28 @@ bool DoSource(CommandLine &CmdL)
if (_config->FindB("APT::Get::Tar-Only",false) == true &&
I->Type != "tar")
continue;
-
+
+ // don't download the same uri twice (should this be moved to
+ // the fetcher interface itself?)
+ if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end())
+ continue;
+ queued.insert(Last->Index().ArchiveURI(I->Path));
+
+ // check if we have a file with that md5 sum already localy
+ if(!I->MD5Hash.empty() && FileExists(flNotDir(I->Path)))
+ {
+ FileFd Fd(flNotDir(I->Path), FileFd::ReadOnly);
+ MD5Summation sum;
+ sum.AddFD(Fd.Fd(), Fd.Size());
+ Fd.Close();
+ if((string)sum.Result() == I->MD5Hash)
+ {
+ ioprintf(c1out,_("Skipping already downloaded file '%s'\n"),
+ flNotDir(I->Path).c_str());
+ continue;
+ }
+ }
+
new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),
I->MD5Hash,I->Size,
Last->Index().SourceInfo(*Last,*I),Src);
@@ -2449,6 +2573,7 @@ void GetInitialize()
_config->Set("APT::Get::Fix-Broken",false);
_config->Set("APT::Get::Force-Yes",false);
_config->Set("APT::Get::List-Cleanup",true);
+ _config->Set("APT::Get::AutomaticRemove",false);
}
/*}}}*/
// SigWinch - Window size change signal handler /*{{{*/
@@ -2504,7 +2629,10 @@ int main(int argc,const char *argv[])
{0,"remove","APT::Get::Remove",0},
{0,"only-source","APT::Get::Only-Source",0},
{0,"arch-only","APT::Get::Arch-Only",0},
+ {0,"auto-remove","APT::Get::AutomaticRemove",0},
{0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
+ {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
+ {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
{'c',"config-file",0,CommandLine::ConfigFile},
{'o',"option",0,CommandLine::ArbItem},
{0,0,0,0}};
@@ -2512,6 +2640,7 @@ int main(int argc,const char *argv[])
{"upgrade",&DoUpgrade},
{"install",&DoInstall},
{"remove",&DoInstall},
+ {"autoremove",&DoInstall},
{"dist-upgrade",&DoDistUpgrade},
{"dselect-upgrade",&DoDSelectUpgrade},
{"build-dep",&DoBuildDep},
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 0685e36f7..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
new file mode 100755
index 000000000..533ed8715
--- /dev/null
+++ b/cmdline/apt-mark
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+
+try:
+ import apt_pkg
+except ImportError:
+ print "Error importing apt_pkg, is python-apt installed?"
+
+import sys
+import os.path
+
+actions = { "markauto" : 1,
+ "unmarkauto": 0
+ }
+
+if __name__ == "__main__":
+ apt_pkg.init()
+
+ # option parsing
+ parser = OptionParser()
+ parser.usage = "%prog [options] {markauto|unmarkauto} packages..."
+ parser.add_option("-f", "--file", action="store", type="string",
+ dest="filename",
+ help="read/write a different file")
+ parser.add_option("-v", "--verbose",
+ action="store_true", dest="verbose", default=False,
+ help="print verbose status messages to stdout")
+ (options, args) = parser.parse_args()
+ if len(args) < 2:
+ parser.error("not enough argument")
+
+ # get pkgs to change
+ if args[0] not in actions.keys():
+ parser.error("first argument must be 'markauto' or 'unmarkauto'")
+ pkgs = args[1:]
+ action = actions[args[0]]
+
+ # get the state-file
+ if not options.filename:
+ STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
+ else:
+ STATE_FILE=options.state_file
+
+ # open the statefile
+ if os.path.exists(STATE_FILE):
+ tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+ outfile = open(STATE_FILE+".tmp","w")
+ while tagfile.Step():
+ pkgname = tagfile.Section.get("Package")
+ autoInst = tagfile.Section.get("Auto-Installed")
+ if pkgname in pkgs:
+ if options.verbose:
+ print "changing %s to %s" % (pkgname,action)
+ newsec = apt_pkg.RewriteSection(tagfile.Section,
+ [],
+ [ ("Auto-Installed",str(action)) ]
+ )
+ outfile.write(newsec+"\n")
+ else:
+ outfile.write(str(tagfile.Section)+"\n")
+ # all done, rename the tmpfile
+ os.rename(outfile.name, STATE_FILE)
diff --git a/configure.in b/configure.in
index 87dac8e47..d9134f4b1 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu3")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
@@ -192,7 +192,7 @@ ah_GCC3DEP
dnl It used to be that the user could select translations and that could get
dnl passed to the makefiles, but now that can only work if you use special
dnl gettext approved makefiles, so this feature is unsupported by this.
-ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
+ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW"
AM_GNU_GETTEXT(external)
if test x"$USE_NLS" = "xyes"; then
AC_DEFINE(USE_NLS)
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 26dfa2530..b4cbf1c8a 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,12 @@
# "APT::Periodic::AutocleanInterval"
# - Do "apt-get autoclean" every n-days (0=disable)
#
+# "APT::Periodic::Unattended-Upgrade"
+# - Run the "unattended-upgrade" security upgrade script
+# every n-days (0=disabled)
+# Requires the package "unattended-upgrades" and will write
+# a log in /var/log/unattended-upgrades
+#
# "APT::Archives::MaxAge",
# - Set maximum allowed age of a cache package file. If a cache
# package file is older it is deleted (0=disable)
@@ -148,6 +154,10 @@ eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists Downl
AutocleanInterval=$DownloadUpgradeableInterval
eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+UnattendedUpgradeInterval=0
+eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
+
+
# laptop check, on_ac_power returns:
# 0 (true) System is on mains power
# 1 (false) System is not on mains power
@@ -182,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
update_stamp $AUTOCLEAN_STAMP
fi
+UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
+if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+ unattended-upgrade
+ update_stamp $UPGRADE_STAMP
+fi
+
# check cache size
check_size_constraints
diff --git a/debian/apt.dirs b/debian/apt.dirs
index d39bfd1f7..e1cb738fa 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -2,6 +2,7 @@ usr/bin
usr/lib/apt/methods
usr/lib/dpkg/methods/apt
etc/apt
+etc/apt/sources.list.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/periodic
diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
configure)
if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
;;
diff --git a/debian/changelog b/debian/changelog
index 0e85b5117..16678d805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,35 +1,444 @@
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
+
+apt (0.6.45) unstable; urgency=low
+
+ * apt-pkg/contrib/sha256.cc:
+ - fixed the sha256 generation (closes: #378183)
+ * ftparchive/cachedb.cc:
+ - applied patch from Anthony Towns to fix Clean() function
+ (closes: #379576)
+ * doc/apt-get.8.xml:
+ - fix path to the apt user build (Closes: #375640)
+ * doc/apt-cache.8.xml:
+ - typo (Closes: #376408)
+ * apt-pkg/deb/dpkgpm.cc:
+ - make progress reporting more robust against multiline error
+ messages (first half of a fix for #374195)
+ * doc/examples/configure-index:
+ - document Debug::pkgAcquire::Auth
+ * methods/gpgv.cc:
+ - deal with gpg error "NODATA". Closes: #296103, Thanks to
+ Luis Rodrigo Gallardo Cruz for the patch
+ * apt-inst/contrib/extracttar.cc:
+ - fix for string mangling, closes: #373864
+ * apt-pkg/acquire-item.cc:
+ - check for bzip2 in /bin (closes: #377391)
+ * apt-pkg/tagfile.cc:
+ - make it work on non-mapable files again, thanks
+ to James Troup for confirming the fix (closes: #376777)
+ * Merged from Christian Perrier bzr branch:
+ * ko.po: Updated to 512t. Closes: #378901
+ * hu.po: Updated to 512t. Closes: #376330
+ * km.po: New Khmer translation: 506t6f. Closes: #375068
+ * ne.po: New Nepali translation: 512t. Closes: #373729
+ * vi.po: Updated to 512t. Closes: #368038
+ * zh_TW.po: Remove an extra %s in one string. Closes: #370551
+ * dz.po: New Dzongkha translation: 512t
+ * ro.po: Updated to 512t
+ * eu.po: Updated
+
+ -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
+
+apt (0.6.44.2ubuntu4) edgy; urgency=low
+
+ * Make apt-get dselect-upgrade happy again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
+
+apt (0.6.44.2ubuntu3) edgy; urgency=low
+
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
+
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
+apt (0.6.44.2) unstable; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+ * apt-pkg/acquire-item.cc:
+ - fix missing chmod() in the new aquire code
+ (thanks to Bastian Blank, Closes: #367425)
+ * merged from
+ http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+ * sk.po: Completed to 512t
+ * eu.po: Completed to 512t
+ * fr.po: Completed to 512t
+ * sv.po: Completed to 512t
+ * Update all PO and the POT. Gives 506t6f for formerly
+ complete translations
+
+ -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200
+
+apt (0.6.44.1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't give an error when parsing empty Packages/Sources files.
+ (Closes: #366931, #367086, #370160)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Fri, 9 Jun 2006 00:52:21 +0200
+
+apt (0.6.44.1) unstable; urgency=low
+
+ * merged from
+ http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+ - po/LINGUAS: added "bg" Closes: #360262
+ - po/gl.po: Galician translation update. Closes: #366849
+ - po/hu.po: Hungarian translation update. Closes: #365448
+ - po/cs.po: Czech translation updated. Closes: #367244
+
+ -- Michael Vogt <mvo@debian.org> Tue, 16 May 2006 21:51:16 +0200
+
+apt (0.6.44) unstable; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
+ * apt-pkg/deb/dpkgpm.cc:
+ - wording fixes (thanks to Matt Zimmerman)
+ - fix error in dpkg interaction (closes: #364513,
+ thanks to Martin Dickopp)
+ * apt-pkg/tagfile.{cc,h}:
+ - use MMap to read the entries (thanks to Zephaniah E. Hull for the
+ patch) Closes: #350025
+ * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+ * bg.po: Added, complete to 512t. Closes: #360262
+ * doc/apt-ftparchive.1.xml:
+ - fix documentation for "SrcPackages" -> "Sources"
+ (thanks to Bart Martens for the patch, closes: #307756)
+ * debian/libapt-pkg-doc.doc-base.cache:
+ - remove broken charackter from description (closes: #361129)
+ * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc:
+ - i18n fixes (closes: #349298)
+ * debian/postinst: dont fail on not available
+ /usr/share/doc/apt/examples/sources.list (closes: #361130)
+ * methods/ftp.cc:
+ - unlink empty file in partial if the download failed because
+ the file is missing on the server (closes: #316337)
+ * apt-pkg/deb/debversion.cc:
+ - treats a version string with explicit zero epoch equal
+ than the same without epoch (Policy 5.6.12, closes: #363358)
+ Thanks to Lionel Elie Mamane for the patch
+
+ -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
+apt (0.6.43.3) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
+
+apt (0.6.43.2) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ - el.po: Completed to 511 strings Closes: #344642
+ - da.po: Completed to 511 strings Closes: #348574
+ - es.po: Updated to 510t1f Closes: #348158
+ - gl.po: Completed to 511 strings Closes: #347729
+ - it.po: Yet another update Closes: #347435
+ * added debian-archive-keyring to the Recommends (closes: #347970)
+ * fixed message in apt-key to install debian-archive-keyring
+ * typos fixed in apt-cache.8 (closes: #348348, #347349)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
+
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
+apt (0.6.43.1) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
+ * fr.po: Completed to 510 strings
+ * it.po: Completed to 510t
+ * en_GB.po: Completed to 510t
+ * cs.po: Completed to 510t
+ * zh_CN.po: Completed to 510t
+ * el.po: Updated to 510t
+ * vi.po: Updated to 383t93f34u
+ * tl.po: Completed to 510 strings (Closes: #344306)
+ * sv.po: Completed to 510 strings (Closes: #344056)
+ * LINGUAS: disabled Hebrew translation. (Closes: #313283)
+ * eu.po: Completed to 510 strings (Closes: #342091)
+ * apt-get source won't download already downloaded files again
+ (closes: #79277)
+ * share/debian-archive.gpg: new 2006 ftp-archive signing key added
+ (#345891)
+ * redownload the Release file if IMS-Hit and gpg failure
+ * deal with multiple signatures on a Release file
+
+ -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
+apt (0.6.43) unstable; urgency=medium
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
+ * zh_CN.po: Completed to 510 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+ * make pkgDirStream (a bit) more complete
+ * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows)
+ (closes: #339533)
+ * pkgAcqFile is more flexible now (closes: #57091)
+ * support a download rate limit for http (closes: #146877)
+ * included lots of the speedup changes from #319377
+ * add stdint.h to contrib/md5.h (closes: #340448)
+ * ABI change, library name changed (closes: #339147)
+ * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
+ * switch to libdb4.3 in build-depends
+
+ -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
+apt (0.6.42.3) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
+ - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+ - patch-119: add update-po as a pre-req for binary (closes: #329910)
+ - patch-121: Complete French translation
+ - patch-125: Fixed localization of y/n questions in German translation
+ (closes: #337078)
+ - patch-126: Swedish translation update (closes: #337163)
+ - patch-127: Complete Tagalog translation (closes: #337306)
+ - patch-128: Danish translation update (closes: #337949)
+ - patch-129: Basque translation update (closes: #338101)
+ * cmdline/apt-get.cc:
+ - bufix in FindSrc (closes: #335213, #337910)
+ * added armeb to archtable (closes: #333599)
+ * with --allow-unauthenticated use the old fallback behaviour for
+ sources (closes: #335112)
+
+ -- Michael Vogt <mvo@debian.org> Wed, 9 Nov 2005 07:22:31 +0100
+
+apt (0.6.42.2) unstable; urgency=high
+
+ * NMU (approved by maintainer)
+ * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500).
+ * Add big-endian arm (armeb) support (closes: #333599).
+ * Priority high to get the AMD key into testing ASAP.
+
+ -- Frans Pop <fjp@debian.org> Sun, 30 Oct 2005 21:29:11 +0100
+
+apt (0.6.42.1) unstable; urgency=low
+
+ * fix a incorrect example in the apt_prefrences man page
+ (thanks to Filipus Klutiero, closes: #282918)
+ * apt-pkg/pkgrecords.cc:
+ - revert patch from last version, it causes trouble on alpha
+ and ia64 (closes: #335102, #335103)
+ * cmdline/apt-get.cc:
+ - be extra carefull in FindSrc (closes: #335213)
+
+ -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200
+
apt (0.6.42) unstable; urgency=low
* apt-pkg/cdrom.cc:
- unmount the cdrom when apt failed to locate any package files
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
- * better error text when dpkg-source fails
+ * better error text when dpkg-source fails
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
- patch-99: Added Galician translation
- patch-100: Completed Danish translation (Closes: #325686)
- patch-104: French translation completed
- patch-109: Italian translation completed
- - patch-112: Swedish translation update
+ - patch-112: Swedish translation update
- patch-115: Basque translation completed (Closes: #333299)
* applied french man-page update (thanks to Philippe Batailler)
(closes: #316638, #327456)
* fix leak in the mmap code, thanks to Daniel Burrows for the
patch (closes: #250583)
* support for apt-get [build-dep|source] -t (closes: #152129)
- * added "APT::Authentication::Trust-CDROM" option to make the life
+ * added "APT::Authentication::TrustCDROM" option to make the life
for the installer people easier (closes: #334656)
* fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
(closes: #334671)
* apt-pkg/contrib/md5.cc:
- fix a alignment problem on sparc64 that gives random bus errors
(thanks to Fabbione for providing a test-case)
- * init the default ScreenWidth to 79 columns by default
+ * init the default ScreenWidth to 79 columns by default
(Closes: #324921)
- * cmdline/apt-cdrom.cc:
+ * cmdline/apt-cdrom.cc:
- fix some missing gettext() calls (closes: #334539)
* doc/apt-cache.8.xml: fix typo (closes: #334714)
-
+
-- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200
apt (0.6.41) unstable; urgency=low
@@ -37,8 +446,8 @@ apt (0.6.41) unstable; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
* added README.progress-reporting to the apt-doc package
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+ * improved the network timeout handling, if a index file from a
+ sources.list times out or EAI_AGAIN is returned from getaddrinfo,
don't try to get the other files from that entry
* Support architecture-specific extra overrides
(closes: #225947). Thanks to Anthony Towns for idea and
@@ -46,10 +455,10 @@ apt (0.6.41) unstable; urgency=low
* Javier Fernandez-Sanguino Pen~a:
- Added a first version of an apt-secure.8 manpage, and modified
apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
+ argument to apt-key which was previously not documented
(Closes: #322120)
* Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
+ - added example apt-ftparchive.conf file to doc/examples
(closes: #322483)
* Fix a incorrect example in the man-page (closes: #282918)
* Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@ -58,10 +467,84 @@ apt (0.6.41) unstable; urgency=low
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
* add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
+ * Reread status configuration on debSystem::Initialize()
(needed for apt-proxy, thanks to Otavio for this patch)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -72,6 +555,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -87,6 +576,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -97,7 +619,14 @@ apt (0.6.39) unstable; urgency=low
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
@@ -114,7 +643,6 @@ apt (0.6.38) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
->>>>>>> MERGE-SOURCE
apt (0.6.37) breezy; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
@@ -130,6 +658,7 @@ apt (0.6.37) breezy; urgency=low
* Add Welsh translation from Dafydd Harries
(daf@muse.19inch.net--2005/apt--main--0--patch-1)
* Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ * Fix a incorrect example in the man-page (closes: #282918)
-- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700
diff --git a/debian/compat b/debian/compat
index 00750edc0..7ed6ff82d 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-3
+5
diff --git a/debian/control b/debian/control
index 4aa7b5aa2..dfcebf41e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12)
+Standards-Version: 3.6.2.2
+Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
Package: apt
@@ -13,6 +13,7 @@ Depends: ${shlibs:Depends}
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
+Recommends: ubuntu-keyring
Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
Section: admin
Description: Advanced front-end for dpkg
diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache
index b58b79bd1..59558dee8 100644
--- a/debian/libapt-pkg-doc.doc-base.cache
+++ b/debian/libapt-pkg-doc.doc-base.cache
@@ -4,7 +4,7 @@ Author: Jason Gunthorpe
Abstract: The APT Cache Specification describes the complete implementation
and format of the APT Cache file. The APT Cache file is a way for APT to
parse and store a large number of package files for display in the UI.
- It's primaryã design goal is to make display of a single package in the
+ It's primary design goal is to make display of a single package in the
tree very fast by pre-linking important things like dependencies and
provides. The specification doubles as documentation for one of the
in-memory structures used by the package library and the APT GUI.
diff --git a/debian/postinst b/debian/postinst
index 891792111..1588f5241 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,7 +12,10 @@ set -e
create_apt_conf ()
{
- cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list
+ EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list
+ if [ -f $EXAMPLE_SOURCE ]; then
+ cp $EXAMPLE_SOURCE /etc/apt/sources.list
+ fi
}
check_apt_conf ()
diff --git a/debian/rules b/debian/rules
index cd026b4a4..333d4ad5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ endif
# Default rule
build:
+PKG=apt
DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
@@ -209,10 +210,15 @@ apt: build debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
- cp share/debian-archive.gpg debian/$@/usr/share/$@
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
# head -n 500 ChangeLog > debian/ChangeLog
+ # make rosetta happy and remove pot files in po/ (but leave stuff
+ # in po/domains/* untouched) and cp *.po into each domain dir
+ rm -f build/po/*.pot
+ rm -f po/*.pot
+
dh_installexamples -p$@ $(BLD)/docs/examples/*
dh_installman -p$@
dh_installcron -p$@
@@ -335,6 +341,6 @@ cvs-mkul:
arch-build:
rm -rf debian/arch-build
mkdir -p debian/arch-build/apt-$(APT_DEBVER)
- baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
+ tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
- (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
+ (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 0e1d2f8d9..2779f2501 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -191,7 +191,7 @@ Reverse Provides:
<varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
<listitem><para><literal>show</literal> performs a function similar to
- <command>dpkg --print-avail</command>i; it displays the package records for the
+ <command>dpkg --print-avail</command>; it displays the package records for the
named packages.</para></listitem>
</varlistentry>
@@ -277,7 +277,7 @@ Reverse Provides:
<listitem><para>Select the file to store the source cache. The source is used only by
<literal>gencaches</literal> and it stores a parsed version of the package
information from remote sources. When building the package cache the
- source cache is used to advoid reparsing all of the package files.
+ source cache is used to avoid reparsing all of the package files.
Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem>
</varlistentry>
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7c1ae9432..8cfbc72e9 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -407,10 +407,10 @@ for i in Sections do
Sets the Packages file output.</para></listitem>
</varlistentry>
- <varlistentry><term>SrcPackages</term>
+ <varlistentry><term>Sources</term>
<listitem><para>
Sets the Sources file output. At least one of
- <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+ <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem>
</varlistentry>
<varlistentry><term>Contents</term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ac84f342a..b98d58737 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -468,7 +468,7 @@
<refsect1><title>See Also</title>
<para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
&apt-conf;, &apt-config;,
- The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para>
+ The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
</refsect1>
<refsect1><title>Diagnostics</title>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e22446030..fa13ddc0f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -120,7 +120,7 @@
<listitem><para><literal>Mirror network compromise</literal>.
Without signature checking, a malicious agent can compromise a
- mirror host and modify the files in it to propage malicious
+ mirror host and modify the files in it to propagate malicious
software to all users downloading packages from that
host.</para></listitem>
</itemizedlist>
diff --git a/doc/apt.ent b/doc/apt.ent
index cf22df6d2..99fe443cf 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -2,6 +2,7 @@
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
+<!ENTITY guidesdir "/usr/share/doc/apt-doc/">
<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 657ec5440..c9d352ab6 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -20,21 +20,21 @@ Default {
// Contents file for these in the main section of the sid release
BinDirectory "pool/main" {
Packages "dists/sid/main/binary-i386/Packages";
- SrcPackages "dists/sid/main/source/Sources";
+ Sources "dists/sid/main/source/Sources";
Contents "dists/sid/Contents-i386";
}
// This is the same for the contrib section
BinDirectory "pool/contrib" {
Packages "dists/sid/contrib/binary-i386/Packages";
- SrcPackages "dists/sid/contrib/source/Sources";
+ Sources "dists/sid/contrib/source/Sources";
Contents "dists/sid/Contents-i386";
}
// This is the same for the non-free section
BinDirectory "pool/non-free" {
Packages "dists/sid/non-free/binary-i386/Packages";
- SrcPackages "dists/sid/non-free/source/Sources";
+ Sources "dists/sid/non-free/source/Sources";
Contents "dists/sid/Contents-i386";
};
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5ab84fe05..5b3c1a55c 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -24,11 +24,15 @@ APT
{
Architecture "i386";
Build-Essential "build-essential";
-
+
+ NeverAutoRemove { "linux-kernel.*"; }; // packages that should never
+ // considered for autoRemove
+
// Options for apt-get
Get
{
Arch-Only "false";
+ AutomaticRemove "false";
Download-Only "false";
Simulate "false";
Assume-Yes "false";
@@ -74,7 +78,7 @@ APT
Authentication
{
- Trust-CDROM "false"; // consider the CDROM always trusted
+ TrustCDROM "false"; // consider the CDROM always trusted
};
GPGV
@@ -90,6 +94,10 @@ APT
Cache-Limit "4194304";
Default-Release "";
+ // consider Recommends, Suggests as important dependencies that should
+ // be installed by default
+ APT::Install-Recommends "false";
+ APT::Install-Suggests "false";
// Write progress messages on this fd (for stuff like base-config)
Status-Fd "-1";
@@ -117,6 +125,7 @@ Acquire
No-Cache "false";
Max-Age "86400"; // 1 Day age on index files
No-Store "false"; // Prevent the cache from storing archives
+ Dl-Limit "7"; // 7Kb/sec maximum download rate
};
ftp
@@ -243,12 +252,15 @@ DPkg
Debug
{
pkgProblemResolver "false";
+ pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgAcquire "false";
pkgAcquire::Worker "false";
+ pkgAcquire::Auth "false";
pkgDPkgPM "false";
pkgDPkgProgressReporting "false";
pkgOrderList "false";
-
+ pkgAutoRemove "false"; // show information about automatic removes
+
pkgInitialize "false"; // This one will dump the configuration space
NoLocking "false";
Acquire::Ftp "false"; // Show ftp command traffic
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9f2343277..a958899ae 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,10 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu dapper main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+deb http://security.ubuntu.com/ubuntu dapper-security main restricted
+deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml
index 61cdfa2ec..9ae6506fc 100644
--- a/doc/fr/apt-ftparchive.fr.1.xml
+++ b/doc/fr/apt-ftparchive.fr.1.xml
@@ -451,10 +451,10 @@ Indique le fichier «&nbsp;Packages&nbsp;» créé.
</para></listitem>
</varlistentry>
-<varlistentry><term>SrcPackages</term>
+<varlistentry><term>Sources</term>
<listitem><para>
Indique le fichier «&nbsp;Sources&nbsp;» créé. L'un des deux fichiers,
-<literal>Packages</literal> ou <literal>SrcPackages</literal> est nécessaire.
+<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire.
</para></listitem>
</varlistentry>
@@ -628,4 +628,4 @@ décimal 100 en cas d'erreur.
&manbugs;
&traducteur;
-</refentry> \ No newline at end of file
+</refentry>
diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index 8832dd22e..cfaa76c7d 100644
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -571,6 +571,11 @@ le guide APT.
</para>
</refsect1>
+ <refsect1><title>Diagnostic</title>
+ <para><command>apt-get</command> renvoie zéro après une opération normale, le décimal 100
+en cas d'erreur.</para>
+ </refsect1>
+
&manbugs;
&deux-traducteurs;
</refentry>
diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml
index 29ba237e2..73a61ea41 100644
--- a/doc/fr/apt-key.fr.8.xml
+++ b/doc/fr/apt-key.fr.8.xml
@@ -18,7 +18,7 @@
<!-- Man page title -->
<refnamediv>
<refname>apt-key</refname>
- <refpurpose>APT key management utility</refpurpose>
+ <refpurpose>Utilitaire de gestion des clés</refpurpose>
</refnamediv>
<!-- Arguments -->
@@ -103,7 +103,7 @@ Debian et supprimer les clés qui sont périmées.
<varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>
</term>
- <listitem><para>>Trousseau des clés fiables supprimées de l'archive Debian.</para></listitem>
+ <listitem><para>Trousseau des clés fiables supprimées de l'archive Debian.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 81130d9ef..d705b9e3e 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,38 @@
<!ENTITY apt-conf "<citerefentry>
<refentrytitle><filename>apt.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-get "<citerefentry>
<refentrytitle><command>apt-get</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-config "<citerefentry>
<refentrytitle><command>apt-config</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY apt-cdrom "<citerefentry>
<refentrytitle><command>apt-cdrom</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-cache "<citerefentry>
<refentrytitle><command>apt-cache</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-preferences "<citerefentry>
<refentrytitle><command>apt_preferences</command></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY apt-key "<citerefentry>
<refentrytitle><command>apt-key</command></refentrytitle>
@@ -69,43 +71,44 @@
<!ENTITY reportbug "<citerefentry>
<refentrytitle><command>reportbug</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg "<citerefentry>
<refentrytitle><command>dpkg</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-buildpackage "<citerefentry>
<refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY gzip "<citerefentry>
<refentrytitle><command>gzip</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-scanpackages "<citerefentry>
<refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-scansources "<citerefentry>
<refentrytitle><command>dpkg-scansources</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dselect "<citerefentry>
<refentrytitle><command>dselect</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY aptitude "<citerefentry>
<refentrytitle><command>aptitude</command></refentrytitle>
@@ -188,12 +191,12 @@
<!ENTITY manbugs "
<refsect1><title>Bogues</title>
<para>
-Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues de APT</ulink>.
- Si vous voulez rapporter un bogue, consultez le texte
+Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues d'APT</ulink>.
+ Si vous voulez signaler un bogue, consultez le texte
<filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la
commande &reportbug;.</para>
- </refsect1>
- ">
+ </refsect1>"
+>
<!-- Boiler plate Author section -->
<!ENTITY manauthor "
@@ -201,17 +204,17 @@ commande &reportbug;.</para>
<para>
APT a été écrit par l'équipe APT <email>apt@packages.debian.org</email>.
</para>
- </refsect1>
-">
+ </refsect1>"
+>
<!-- Section traduction -->
<!ENTITY deux-traducteurs "
<refsect1><title>Traduction</title>
<para>
Jérôme Marant. 2000&nbsp;; mise à jour : Philippe Batailler. 2005.
-</para>
-</refsect1>
-">
+<email>debian-l10n-french@lists.debian.org</email>.</para>
+</refsect1>"
+>
<!ENTITY traducteur "
<refsect1><title>Traduction</title>
diff --git a/doc/fr/sources.list.fr.5.xml b/doc/fr/sources.list.fr.5.xml
index 4abd9c95e..4235480f8 100644
--- a/doc/fr/sources.list.fr.5.xml
+++ b/doc/fr/sources.list.fr.5.xml
@@ -25,16 +25,15 @@
<refnamediv>
<refname>sources.list</refname>
-<refpurpose>Une liste, utilisée par APT, indiquant les ressources de paquets</refpurpose>
+<refpurpose>Liste des sources de paquets</refpurpose>
</refnamediv>
<refsect1><title>Description</title>
<para>
-La liste des ressources de paquets indique où trouver les archives
+La liste des sources de paquets indique où trouver les archives
du système de distribution de paquets utilisé. Pour l'instant, cette page
de manuel ne documente que le système d'empaquetage utilisé par le système
-Debian GNU/Linux. Ce fichier de contrôle est situé dans
-<filename>/etc/apt/sources.list</filename>.
+Debian GNU/Linux. Ce fichier de contrôle est <filename>/etc/apt/sources.list</filename>.
</para>
<para>
La liste des sources est conçue pour prendre en compte un nombre quelconque
@@ -49,17 +48,26 @@ ligne peut être un commentaire commençant par un caractère #.
</para>
</refsect1>
+<refsect1><title>sources.list.d</title>
+<para> Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de
+lister des sources de paquets dans des fichiers distincts qui se terminent
+par <literal>.list</literal>. Leur format est le même que celui du fichier
+<filename>sources.list</filename>.
+</para>
+ </refsect1>
+
<refsect1><title>Les types deb et deb-src.</title>
<para>
Le type <literal>deb</literal> décrit une archive Debian classique à deux niveaux,
<filename>distribution/composant</filename>. <literal>distribution</literal> peut prendre
l'une des valeurs suivantes&nbsp;: <literal>stable</literal>, <literal>unstable</literal>, ou
-<literal>testing</literal>, et composant&nbsp;: <literal>main</literal>, <literal>contrib</literal>,
-<literal>non-free</literal>, ou <literal>non-us</literal>. Le type <literal>deb-src</literal>
-décrit le
+<literal>testing</literal>, et composant&nbsp;: <literal>main</literal>,
+<literal>contrib</literal>,
+<literal>non-free</literal>, ou <literal>non-us</literal>.
+Le type <literal>deb-src</literal> décrit le
code source pour une distribution Debian dans le même format que le type
<literal>deb</literal>. Une ligne <literal>deb-src</literal> est nécessaire pour récupérer les
-index de sources.
+index des sources.
</para>
<para>
Le format d'une entrée dans <filename>sources.list</filename> utilisant les types
@@ -73,7 +81,7 @@ dans laquelle APT trouvera les informations dont il a besoin.
doit omettre les composants et <literal>distribution</literal> doit se terminer par une
barre oblique (/). C'est utile quand seule une sous-section particulière de
l'archive décrite par cet URI est intéressante. Quand <literal>distribution</literal>
-n'indique pas un chemin exact, un <literal>component</literal> au moins doit être
+n'indique pas un chemin exact, un <literal>composant</literal> au moins doit être
présent.
</para>
<para>
@@ -101,8 +109,8 @@ efficacement parti des sites à faible bande passante.
<para>
Il est important d'indiquer les sources par ordre de préférence,
la source principale apparaissant en premier. Un tri est fait, de la plus
-rapide à la plus lente&nbsp;; par exemple, CD-ROM suivi par les hôtes d'un
-réseau local, puis les hôtes Internet distants.
+rapide à la plus lente&nbsp;; par exemple, un cédérom suivi par les hôtes d'un
+réseau local, puis les hôtes distants.
</para>
<para>Voici quelques exemples&nbsp;:
</para>
@@ -127,9 +135,9 @@ montages NFS, les miroirs et les archives locaux.
<varlistentry><term>cdrom</term>
<listitem><para>
-Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CDROM local
+Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de cédérom
avec la possibilité de changer de media. Utilisez le programme &apt-cdrom;
-pour créer des entrées dans la liste de sources.
+pour créer des entrées dans la liste des sources.
</para>
</listitem>
</varlistentry>
@@ -149,8 +157,8 @@ méthode d'authentification peu sûre.
<varlistentry><term>ftp</term>
<listitem><para>
Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. Le
-fonctionnement en mode ftp est grandement configurable&nbsp;; référez-vous
-à la page de manuel de &apt-cdrom; pour davantage de renseignements. On
+fonctionnement en mode ftp est largement configurable&nbsp;; référez-vous
+à la page de manuel de &apt-cdrom; pour d'autres informations. On
remarquera qu'on peut indiquer un mandataire ftp avec la variable
d'environnement <envar>ftp_proxy</envar>. On peut aussi spécifier un mandataire http
(les serveurs mandataires http comprennent souvent les URL ftp) en utilisant
diff --git a/doc/ja/apt-cache.ja.8.sgml b/doc/ja/apt-cache.ja.8.sgml
deleted file mode 100644
index 020137021..000000000
--- a/doc/ja/apt-cache.ja.8.sgml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.10 -->
-<!-- Bug#175611 is fixed in translation -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-cache</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-cache</>
-<!-- <refpurpose>APT package handling utility - - cache manipulator</> -->
- <refpurpose>APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ -- ¥­¥ã¥Ã¥·¥åÁàºî</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-cache</>
- <arg><option>-hvsn</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
- <arg>gencaches</>
- <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>stats</>
- <arg>dump</>
- <arg>dumpavail</>
- <arg>unmet</>
- <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
- <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-<!--
-Bug#175611
- <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> -->
- <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
- <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!-- <RefSect1><Title>Description</>-->
- <RefSect1><Title>ÀâÌÀ</>
- <para>
-<!--
- <command/apt-cache/ performs a variety of operations on APT's package
- cache. <command/apt-cache/ does not manipulate the state of the system
- but does provide operations to search and generate interesting output
- from the package metadata.
--->
- <command/apt-cache/ ¤Ï APT ¤Î¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ËÂФ·¤Æ¤¤¤í¤¤¤í¤ÊÁàºî¤ò¹Ô¤¤¤Þ¤¹¡£
- <command/apt-cache/ ¤Ï¡¢¥·¥¹¥Æ¥à¾õÂÖ¤ÎÁàºî¤Ï¹Ô¤¤¤Þ¤»¤ó¤¬¡¢
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥¿¥Ç¡¼¥¿¤è¤ê¸¡º÷¤·¤¿¤ê¡¢¶½Ì£¿¼¤¤½ÐÎϤòÀ¸À®¤¹¤ë¤È¤¤¤Ã¤¿Áàºî¤ò
- Ä󶡤·¤Þ¤¹¡£
- <para>
-<!--
- Unless the <option/-h/, or <option/-/-help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ ¤ä <option/--help/ ¤ò½ü¤­¡¢°Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£
- <VariableList>
- <VarListEntry><Term>add</Term>
- <ListItem><Para>
-<!--
- <literal/add/ adds the named package index files to the package cache.
- This is for debugging only.
--->
- <literal/add/ ¤Ï¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ë¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹
- ¥Õ¥¡¥¤¥ë¤òÄɲä·¤Þ¤¹¡£¥Ç¥Ð¥Ã¥°ÀìÍѤǤ¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>gencaches</Term>
- <ListItem><Para>
-<!--
- <literal/gencaches/ performs the same opration as
- <command/apt-get check/. It builds the source and package caches from
- the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>.
--->
- <literal/gencaches/ ¤Ï <command/apt-get check/ ¤ÈƱ¤¸Æ°ºî¤òÄ󶡤·¤Þ¤¹¡£
- ¤³¤ì¤Ï &sources-list; Æâ¤Î¼èÆÀ¸µ¤È <filename>/var/lib/dpkg/status</>
- ¤«¤é¡¢¥½¡¼¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¥­¥ã¥Ã¥·¥å¤ò¹½ÃÛ¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>showpkg</Term>
- <ListItem><Para>
-<!--
- <literal/showpkg/ displays information about the packages listed on the
- command line. Remaining arguments are package names. The available
- versions and reverse dependencies of each package listed are listed, as
- well as forward dependencies for each version. Forward (normal)
- dependencies are those packages upon which the package in question
- depends; reverse dependencies are those packages that depend upon the
- package in question. Thus, forward dependencies must be satisfied for a
- package, but reverse dependencies need not be.
- For instance, <command>apt-cache showpkg libreadline2</> would produce
- output similar to the following:
--->
- <literal/showpkg/ ¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤ËÎóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤ò
- ɽ¼¨¤·¤Þ¤¹¡£»Ä¤ê¤Î°ú¿ô¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£
- Îóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢³Æ¥Ð¡¼¥¸¥ç¥ó¤Î°Í¸´Ø·¸¤òɽ¼¨¤¹¤ë¤è¤¦¤Ë ¡¢
- Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÈÈï°Í¸´Ø·¸¤òÎóµó¤·¤Þ¤¹¡£
- (Àµ)°Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤¬°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¤µ¤·¤Þ¤¹¡£
- ¤Þ¤¿¡¢Èï°Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤Ë°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¤µ¤·¤Þ¤¹¡£
- ½¾¤Ã¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤ÏËþ¤¿¤µ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢
- Èï°Í¸´Ø·¸¤Ï¤½¤ÎɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
- ¼ÂÎã¤È¤·¤Æ¡¢°Ê²¼¤Ë <command>apt-cache showpkg libreadline2</> ¤Î
- ½ÐÎϤò·Ç¤²¤Þ¤¹¡£
-
-<informalexample><programlisting>
-Package: libreadline2
-Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
-Reverse Depends:
- libreadlineg2,libreadline2
- libreadline2-altdev,libreadline2
-Dependencies:
-2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
-Provides:
-2.1-12 -
-Reverse Provides:
-</programlisting></informalexample>
-
- <para>
-<!-- Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and
- ncurses3.0 which must be installed for libreadline2 to work.
- In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
- libreadline2 is installed, libc5, ncurses3.0, and ldso must also be
- installed; libreadlineg2 and libreadline2-altdev do not have to be
- installed. For the specific meaning of the remainder of the output it
- is best to consult the apt source code.
--->
- ¤Ä¤Þ¤ê¡¢libreadline2 ¤Î version 2.1-12 ¤Ï libc5 ¤È ncurses3.0 ¤Ë°Í¸¤·¤Æ
- ¤¤¤Æ¡¢libreadline2 ¤¬Æ°ºî¤¹¤ë¤Ë¤Ï¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤È
- ¤¤¤¦¤³¤È¤¬È½¤ê¤Þ¤¹¡£
- °ìÊý¡¢libreadlineg2 ¤È libreadline2-altdev ¤Ï libreadline2 ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£
- libreadline2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢libc5, ncurses3.0, ldso ¤ò
- ¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢libreadlineg2 ¤È
- libreadline2-altdev ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
- ½ÐÎϤλĤê¤ÎÉôʬ¤Î°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Ï¡¢apt ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÄ´¤Ù¤ë¤Î¤¬ºÇÎɤǤ·¤ç¤¦¡£
- </VarListEntry>
-
- <VarListEntry><Term>stats</Term>
- <ListItem><Para>
-<!--
- <literal/stats/ displays some statistics about the cache.
- No further arguments are expected. Statistics reported are:
--->
- <literal/stats/ ¤Ï¥­¥ã¥Ã¥·¥å¤Ë¤Ä¤¤¤Æ¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
- ¤½¤ì°Ê¾å¡¢°ú¿ô¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£°Ê²¼¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
- <itemizedlist>
-<!--
-°Ê²¼ stats ¤Î¥ê¥Æ¥é¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢É½¼¨¤µ¤ì¤ë¹àÌÜ̾ (¤½¤ÎÌõʸ) ¤È¤¤¤¦·Á¼°¤Ç
-µ­½Ò¤·¤Þ¤¹¡£(ɽ¼¨¤µ¤ì¤ë¹àÌܤÈÌõ¤¬¤«¤±Î¥¤ì¤Ê¤¤¤è¤¦¤Ë)
-ºÇ½ªÅª¤Ë¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°ËÝÌõ¸å¤Ë½¤Àµ¤µ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£(ÁÒß·)
--->
- <listitem><para>
-<!--
- <literal/Total package names/ is the number of package names found
- in the cache.
--->
- <literal/Total package names (Áí¥Ñ¥Ã¥±¡¼¥¸·×)/ ¤Ï¡¢
- ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Normal packages/ is the number of regular, ordinary package
- names; these are packages that bear a one-to-one correspondence between
- their names and the names used by other packages for them in
- dependencies. The majority of packages fall into this category.
--->
- <literal/Normal packages (Ä̾ï¥Ñ¥Ã¥±¡¼¥¸)/ ¤Ï¡¢
- ¸ø¼°¤ÎÉáÄ̤Υѥ屡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Ç»ÈÍѤµ¤ì¤¿Ì¾¾Î¤Ç¡¢¤½¤ì¤¬°ìÂаì¤ËÂбþ
- ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
- Âç¿¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤³¤Î¥«¥Æ¥´¥ê¤ËÆþ¤ê¤Þ¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Pure virtual packages/ is the number of packages that exist
- only as a virtual package name; that is, packages only "provide" the
- virtual package name, and no package actually uses the name. For
- instance, "mail-transport-agent" in the Debian GNU/Linux system is a
- pure virtual package; several packages provide "mail-transport-agent",
- but there is no package named "mail-transport-agent".
--->
- <literal/Pure virtual packages (½ã²¾Áۥѥ屡¼¥¸)/ ¤Ï¡¢
- ²¾Áۥѥ屡¼¥¸Ì¾¤È¤·¤Æ¤Î¤ß¸ºß¤¹¤ë
- ¥Ñ¥Ã¥±¡¼¥¸ (²¾Áۥѥ屡¼¥¸Ì¾¤Î¤ß¤ò¡ÖÄ󶡡פ·¡¢¼ÂºÝ¤Ë¤Ï¤¤¤«¤Ê¤ë
- ¥Ñ¥Ã¥±¡¼¥¸¤â¤½¤Î̾¾Î¤ò»ý¤¿¤Ê¤¤) ¤Î¿ô¤òɽ¤·¤Þ¤¹¡£
- Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï "mail-transport-agent" ¤Ï
- ½ã²¾Áۥѥ屡¼¥¸¤Ç¤¹¡£"mail-transport-agent" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï
- ¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¤¬¡¢"mail-transport-agent" ¤È¤¤¤¦Ì¾¾Î¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï
- ¤¢¤ê¤Þ¤»¤ó¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Single virtual packages/ is the number of packages with only
- one package providing a particular virtual package. For example, in the
- Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
- only one package, xless, provides "X11-text-viewer".
--->
- <literal/Single virtual packages (ñ²¾Áۥѥ屡¼¥¸)/ ¤Ï¡¢
- ÆÃÄê¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢
- ¤¿¤À°ì¤Ä¤Î¾ì¹ç¤Î¿ô¤òɽ¤·¤Þ¤¹¡£
- Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢"X11-text-viewer" ¤Ï
- ²¾Áۥѥ屡¼¥¸¤Ç¤¹¤¬¡¢"X11-text-viewer" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢
- xless ¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Mixed virtual packages/ is the number of packages that either
- provide a particular virtual package or have the virtual package name
- as the package name. For instance, in the Debian GNU/Linux system,
- debconf is both an actual package, and provided by the debconf-tiny
- package.
--->
- <literal/Mixed virtual packages (Ê£²¾Áۥѥ屡¼¥¸)/ ¤Ï¡¢
- ¤½¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤¢¤ë¤«¡¢
- ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈƱ¤¸²¾Áۥѥ屡¼¥¸Ì¾¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£
- Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢debconf ¤Ï¼ÂºÝ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤â
- ¤¢¤ê¤Þ¤¹¤¬¡¢debconf-tiny ¤Ë¤è¤Ã¤ÆÄ󶡤⤵¤ì¤Æ¤¤¤Þ¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Missing/ is the number of package names that were referenced in
- a dependency but were not provided by any package. Missing packages may
- be in evidence if a full distribution is not accesssed, or if a package
- (real or virtual) has been dropped from the distribution. Usually they
- are referenced from Conflicts statements.
--->
- <literal/Missing (·çÍî)/ ¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢¤É¤Î¥Ñ¥Ã¥±¡¼¥¸
- ¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£
- ¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç
- ¤­¤Æ¤¤¤Ê¤¤¤«¡¢(¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é
- ¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤òɽ¤·¤Þ¤¹¡£
- Ä̾¤³¤ì¤Ï¹½Ê¸¤¬Ì·½â¤¹¤ë¤³¤È¤Ç»²¾È¤µ¤ì¤Þ¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Total distinct/ versions is the number of package versions
- found in the cache; this value is therefore at least equal to the
- number of total package names. If more than one distribution (both
- "stable" and "unstable", for instance), is being accessed, this value
- can be considerably larger than the number of total package names.
--->
- <literal/Total distinct versions (¸ÄÊ̥С¼¥¸¥ç¥ó·×)/ ¤Ï¥­¥ã¥Ã¥·¥å¤Ë
- ¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¿ô¤òɽ¤·¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤ÎÃͤÏ
- ºÇ¾®¤Ç¤âÁí¥Ñ¥Ã¥±¡¼¥¸·×¤È°ìÃפ·¤Þ¤¹¡£
- ¤¿¤È¤¨¤Ð 2 ¼ïÎà°Ê¾å¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó
- ("stable" ¤È "unstable"¤ÎξÊý¤Ê¤É) ¤òÍøÍѤ·¤¿¾ì¹ç¡¢
- ¤³¤ÎÃͤϥѥ屡¼¥¸·×¤è¤ê¤â¤«¤Ê¤êÂ礭¤¤¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Total dependencies/ is the number of dependency relationships
- claimed by all of the packages in the cache.
--->
- <literal/Total dependencies (Áí°Í¸´Ø·¸)/ ¤Ï¥­¥ã¥Ã¥·¥åÆâ¤Î¤¹¤Ù¤Æ¤Î
- ¥Ñ¥Ã¥±¡¼¥¸¤ÇÍ׵ᤵ¤ì¤¿°Í¸´Ø·¸¤Î¿ô¤Ç¤¹¡£
- </listitem>
- </itemizedlist>
- </VarListEntry>
-
- <VarListEntry><Term>showsrc</Term>
- <ListItem><Para>
-<!--
- <literal/showsrc/ displays all the source package records that match
- the given package names. All versions are shown, as well as all
- records that declare the name to be a Binary.
- named packages.
--->
- <literal/showsrc/ ¤Ï»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È°ìÃפ¹¤ë¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢
- ¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢¥Ð¥¤¥Ê¥ê¤Ë¤Ê¤ë¤È¤­¤Î̾¾Î¤ò
- Àë¸À¤·¤¿¥ì¥³¡¼¥ÉƱÍͤˡ¢¤¹¤Ù¤Æ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æɽ¼¨¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>dump</Term>
- <ListItem><Para>
-<!--
- <literal/dump/ shows a short listing of every package in the cache. It is
- primarily for debugging.
--->
- <literal/dump/ ¤Ï¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸Ëè¤Î¡¢Ã»¤¤°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
- ¼ç¤Ë¥Ç¥Ð¥Ã¥°ÍѤǤ¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>dumpavail</Term>
- <ListItem><Para>
-<!--
- <literal/dumpavail/ prints out an available list to stdout. This is
- suitable for use with &dpkg; and is used by the &dselect; method.
--->
- <literal/dumpavail/ ¤Ïɸ½à½ÐÎϤˡ¢ÍøÍѲÄǽ¤Ê¤â¤Î¤Î°ìÍ÷¤ò½ÐÎϤ·¤Þ¤¹¡£
- &dpkg; ¤È¶¦¤Ë»ÈÍѤ¹¤ë¤ÈÊØÍø¤Ç¤¹¡£¤Þ¤¿ &dselect; ¤Ç¤â»ÈÍѤµ¤ì¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>unmet</Term>
- <ListItem><Para>
-<!--
- <literal/unmet/ displays a summary of all unmet dependencies in the
- package cache.
--->
- <literal/unmet/ ¤Ï¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥åÆâ¤Î¡¢ÉÔŬÅö¤Ê°Í¸´Ø·¸¤Î³µÍפò
- ɽ¼¨¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>show</Term>
- <ListItem><Para>
-<!--
- <literal/show/ performs a function similar to
- <command>dpkg - -print-avail</>, it displays the package records for the
- named packages.
--->
- <literal/show/ ¤Ï <command>dpkg --print-avail</> ¤Ë»÷¤¿µ¡Ç½¤ò¼Â¹Ô¤·¤Þ¤¹¡£
- »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɽ¼¨¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>search</Term>
- <ListItem><Para>
-<!--
- <literal/search/ performs a full text search on all available package
- files for the regex pattern given. It searchs the package names and the
- descriptions for an occurance of the string and prints out the package
- name and the short description. If <option/- -full/ is given then output
- identical to <literal/show/ is produced for each matched package and
- if <option/- -names-only/ is given then the long description is not
- searched, only the package name is.
--->
- <literal/search/ ¤ÏÍ¿¤¨¤é¤ì¤¿Àµµ¬É½¸½¤Ë¤è¤Ã¤Æ¡¢¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê
- ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤ÆÁ´Ê¸¸¡º÷¤ò¹Ô¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈÀâÌÀ¤ËÂФ·¤Æ¸¡º÷¤ò
- ¹Ô¤¤¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Èû¤¤ÀâÌÀʸ¤òɽ¼¨¤·¤Þ¤¹¡£
- <option/--full/ ¤¬Í¿¤¨¤é¤ì¤¿¾ì¹ç¡¢¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·
- <literal/show/ ¤ÈƱ¤¸¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
- <option/--names-only/ ¤¬Í¿¤¨¤é¤ì¤¿¾ì¹ç¤Ï¡¢ÀâÌÀʸ¤ËÂФ·¤Æ¸¡º÷¤ò¹Ô¤ï¤º¡¢
- ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤Æ¤Î¤ßÂоݤȤ·¤Þ¤¹¡£
- <para>
-<!--
- Seperate arguments can be used to specified multiple search patterns that
- are and'd together.
--->
- ¶õÇò¤Ç¶èÀڤä¿°ú¿ô¤ÇÊ£¿ô¤Î¸¡º÷¥Ñ¥¿¡¼¥ó¤Î and ¤ò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>depends</Term>
- <ListItem><Para>
-<!--
- <literal/depends/ shows a listing of each dependency a package has
- and all the possible other packages that can fullfill that dependency.
--->
- <literal/depends/ ¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤¬»ý¤Ã¤Æ¤¤¤ë°Í¸´Ø·¸¤È¡¢¤½¤Î°Í¸´Ø·¸¤ò
- Ëþ¤¿¤¹Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>pkgnames</Term>
- <ListItem><Para>
-<!--
- This command prints the name of each package in the system. The optional
- argument is a prefix match to filter the name list. The output is suitable
- for use in a shell tab complete function and the output is generated
- extremly quickly. This command is best used with the
- <option/- -generate/ option.
--->
- ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥·¥¹¥Æ¥à¤Ç¤Î³Æ¥Ñ¥Ã¥±¡¼¥¸¤Î̾¾Î¤òɽ¼¨¤·¤Þ¤¹¡£
- ¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ë¤è¤ê¡¢¼èÆÀ¤¹¤ë°ìÍ÷¤è¤êÀèƬ°ìÃפÇÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- ¤³¤Î½ÐÎϤϥ·¥§¥ë¤Î¥¿¥Ö¤Ë¤è¤ëÊä´°µ¡Ç½¤Ç»È¤¤¤ä¤¹¤¯¡¢¤Þ¤¿Èó¾ï¤Ë®¤¯À¸À®¤µ¤ì¤Þ¤¹¡£
- ¤³¤Î¥³¥Þ¥ó¥É¤Ï <option/--generate/ ¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍѤ¹¤ë¤ÈÈó¾ï¤Ë
- ÊØÍø¤Ç¤¹¡£
- </VarListEntry>
- <VarListEntry><Term>dotty</Term>
- <ListItem><Para>
-<!--
- <literal/dotty/ takes a list of packages on the command line and
- gernerates output suitable for use by dotty from the
- <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
- package. The result will be a set of nodes and edges representing the
- relationships between the packages. By default the given packages will
- trace out all dependent packages which can produce a very large graph.
- This can be turned off by setting the
- <literal>APT::Cache::GivenOnly</> option.
--->
- <literal/dotty/ ¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¡¢
- <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
- ¥Ñ¥Ã¥±¡¼¥¸¤Î dotty ¥³¥Þ¥ó¥É¤ÇÍøÍѤ¹¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£
- ·ë²Ì¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î´Ø·¸¤òɽ¤ï¤¹¡¢¥Î¡¼¥É¡¦¥¨¥Ã¥¸¤Î¥»¥Ã¥È¤Çɽ¸½¤µ¤ì¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î°Í¸¥Ñ¥Ã¥±¡¼¥¸¤ò¥È¥ì¡¼¥¹¤¹¤ë¤Î¤Ç¡¢Èó¾ï¤ËÂ礭¤¤
- ¿Þ¤¬ÆÀ¤é¤ì¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢<literal>APT::Cache::GivenOnly</> ¥ª¥×¥·¥ç¥ó¤ÎÀßÄê¤Ç²ò½ü¤¹¤ë
- ¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- <para>
-<!--
- The resulting nodes will have several shapse, normal packages are boxes,
- pure provides are triangles, mixed provides are diamonds,
- hexagons are missing packages. Orange boxes mean recursion was stopped
- [leaf packages], blue lines are prre-depends, green lines are conflicts.
--->
- ·ë²Ì¤Î¥Î¡¼¥É¤Ï¿ô¼ïÎà¤Î·Á¾õ¤È¤Ê¤ê¤Þ¤¹¡£
- Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï»Í³Ñ¡¢½ã²¾Áۥѥ屡¼¥¸¤Ï»°³Ñ¡¢Ê£²¾Áۥѥ屡¼¥¸¤ÏÉ©·Á¡¢
- Ï»³Ñ·Á¤Ï·çÍî¥Ñ¥Ã¥±¡¼¥¸¤ò¤½¤ì¤¾¤ìɽ¤·¤Þ¤¹¡£
- ¥ª¥ì¥ó¥¸¤Î»Í³Ñ¤ÏºÆµ¯¤¬½ªÎ»¤·¤¿¡Ö¥ê¡¼¥Õ¥Ñ¥Ã¥±¡¼¥¸¡×¡¢ÀĤ¤Àþ¤Ï pre-depends¡¢
- ÎФÎÀþ¤Ï¶¥¹ç¤òɽ¤·¤Þ¤¹¡£
- <para>
-<!--
- Caution, dotty cannot graph larger sets of packages.
--->
- Ãí°Õ) dotty ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¤è¤êÂ礭¤Ê¥»¥Ã¥È¤Î¥°¥é¥Õ¤ÏÉÁ¤±¤Þ¤»¤ó¡£
- <VarListEntry><Term>policy</Term>
- <ListItem><Para>
-<!--
- <literal/policy/ is ment to help debug issues relating to the
- preferences file. With no arguments it will print out the
- priorities of each source. Otherwise it prints out detailed information
- about the priority selection of the named package.
--->
- <literal/policy/ ¤ÏÀßÄê¥Õ¥¡¥¤¥ë´Ø·¸¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¡¢¥Ç¥Ð¥Ã¥°¤ò»Ù±ç¤·¤Þ¤¹¡£
- °ú¿ô¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¼èÆÀ¸µ¤´¤È¤ÎÍ¥Àè½ç°Ì¤òɽ¼¨¤·¤Þ¤¹¡£
- °ìÊý¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Í¥Àè½ç¤Î¾ÜºÙ¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>¥ª¥×¥·¥ç¥ó</>
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</>
- <ListItem><Para>
-<!--
- Select the file to store the package cache. The package cache is the
- primary cache used by all operations.
- Configuration Item: <literal/Dir::Cache::pkgcache/.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£
- ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ï¡¢¤¹¤Ù¤Æ¤ÎÁàºî¤Ç»ÈÍѤµ¤ì¤ë°ì¼¡¥­¥ã¥Ã¥·¥å¤Ç¤¹¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Cache::pkgcache/
- </VarListEntry>
-
- <VarListEntry><term><option/-s/</><term><option/--src-cache/</>
- <ListItem><Para>
-<!--
- Select the file to store the source cache. The source is used only by
- <literal/gencaches/ and it stores a parsed version of the package
- information from remote sources. When building the package cache the
- source cache is used to advoid reparsing all of the package files.
- Configuration Item: <literal/Dir::Cache::srcpkgcache/.
--->
- ¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£
- ¤³¤Î¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï <literal/gencaches/ ¤Ç¤Î¤ß»ÈÍѤµ¤ì¡¢
- ¤³¤³¤Ë²òÀϤµ¤ì¤¿¼èÆÀ¸µ¤Î¥Ñ¥Ã¥±¡¼¥¸¾ðÊ󤬳ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
- ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë¡¢¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï¡¢
- Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òºÆ²òÀϤòÈò¤±¤ë¾å¤ÇÊØÍø¤Ç¤¹¡£
- <!--advoid ¤Ï avoid ¤Î¥ß¥¹¥¹¥Ú¥ë¡© -->
- ÀßÄê¹àÌÜ - <literal/Dir::Cache::srcpkgcache/
- </VarListEntry>
-
- <VarListEntry><term><option/-q/</><term><option/--quiet/</>
- <ListItem><Para>
-<!--
- Quiet; produces output suitable for logging, omitting progress indicators.
- More qs will produce more quite up to a maximum of 2. You can also use
- <option/-q=#/ to set the quiet level, overriding the configuration file.
- Configuration Item: <literal/quiet/.
--->
- ÀŲº - ¿ÊĽɽ¼¨¤ò¾Êά¤·¤Æ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£
- ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŤ«¤Ë¤Ç¤­¤Þ¤¹¡£
- ¤Þ¤¿¡¢<option/-q=#/ ¤Î¤è¤¦¤ËÀŲº¥ì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò
- ¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/quiet/
- </VarListEntry>
-
- <VarListEntry><term><option/-i/</><term><option/--important/</>
- <ListItem><Para>
-<!--
- Print only important deps; for use with unmet causes only Depends and
- Pre-Depends relations to be printed.
- Configuration Item: <literal/APT::Cache::Important/.
--->
- ¡Ö½ÅÍספΤßɽ¼¨ - Dipends ¤È Pre-Depends ¤Î¤ßɽ¼¨¤¹¤ë¤¿¤á¡¢
- unmet ¤È¶¦¤Ë»ÈÍѤ·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::Important/
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--full/</>
- <ListItem><Para>
-<!--
- Print full package records when searching.
- Configuration Item: <literal/APT::Cache::ShowFull/.
--->
- search »þ¤ËÁ´¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɽ¼¨¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::ShowFull/
- </VarListEntry>
-
- <VarListEntry><term><option/-a/</><term><option/--all-versions/</>
- <ListItem><Para>
-<!--
- Print full records for all available versions, this is only applicable to
- the show command.
- Configuration Item: <literal/APT::Cache::AllVersions/.
--->
- Á´ÍøÍѲÄǽ¥Ð¡¼¥¸¥ç¥ó¤ÎÁ´¥ì¥³¡¼¥É¤òɽ¼¨¤·¤Þ¤¹¡£
- show ¥³¥Þ¥ó¥É¤Ç¤Î¤ßŬÍѤǤ­¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::AllVersions/
- </VarListEntry>
-
- <VarListEntry><term><option/-g/</><term><option/--generate/</>
- <ListItem><Para>
-<!--
- Perform automatic package cache regeneration, rather than use the cache
- as it is. This is the default, to turn it off use <option/- -no-generate/.
- Configuration Item: <literal/APT::Cache::Generate/.
--->
- ¤½¤Î¤Þ¤Þ¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¼«Æ°Åª¤Ë¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò
- ºÆÀ¸À®¤·¤Þ¤¹¡£¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¤¹¤¬¡¢<option/--no-generate/ ¤ò
- »ÈÍѤ¹¤ë¤È̵¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::Generate/
- </VarListEntry>
-
- <VarListEntry><term><option/--names-only/</><term><option/-n/</>
- <ListItem><Para>
-<!--
- Only search on the package names, not the long description.
- Configuration Item: <literal/APT::Cache::NamesOnly/.
--->
- ÀâÌÀʸ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¤Î¤ß¸¡º÷¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::NamesOnly/
- </VarListEntry>
-
- <VarListEntry><term><option/--all-names/</>
- <ListItem><Para>
-<!--
- Make <literal/pkgnames/ print all names, including virtual packages
- and missing dependencies.
- Configuration Item: <literal/APT::Cache::AllNames/.
--->
- <literal/pkgnames/ ¤Ç¡¢²¾Áۥѥ屡¼¥¸¤äÉÔÌÀ¤Ê°Í¸´Ø·¸¤ò´Þ¤á¤¿Á´Ì¾¾Î¤ò
- ɽ¼¨¤µ¤»¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::AllNames/
- </VarListEntry>
-
- <VarListEntry><term><option/--recurse/</>
- <ListItem><Para>
-<!--
- Make <literal/depends/ recursive so that all packages mentioned are
- printed once.
- Configuration Item: <literal/APT::Cache::RecurseDepends/.
--->
- <literal/depends/ ¤Ç¡¢»ØÄꤷ¤¿Á´¥Ñ¥Ã¥±¡¼¥¸¤òºÆµ¢Åª¤Ë°ìÅÙ¤Ëɽ¼¨¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Cache::RecurseDepends/
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>¥Õ¥¡¥¤¥ë</>
- <variablelist>
- <VarListEntry><term><filename>/etc/apt/sources.list</></term>
- <ListItem><Para>
-<!--
- locations to fetch packages from.
- Configuration Item: <literal/Dir::Etc::SourceList/.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Etc::SourceList/
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/</></term>
- <ListItem><Para>
-<!--
- storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal/Dir::State::Lists/.
--->
- &sources-list; ¤Ë»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¤´¤È¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::State::Lists/
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for state information in transit.
- Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
- ¼èÆÀÃæ¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::State::Lists/ (ɬÁ³Åª¤ËÉÔ´°Á´¤Ç¤¹)
- </VarListEntry>
- </variablelist>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>´ØÏ¢¹àÌÜ</>
- <para>
- &apt-conf;, &sources-list;, &apt-get;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>¿ÇÃÇ¥á¥Ã¥»¡¼¥¸</>
- <para>
-<!--
- <command/apt-cache/ returns zero on normal operation, decimal 100 on error.
--->
- <command/apt-cache/ ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£
- ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
diff --git a/doc/ja/apt-cache.ja.8.xml b/doc/ja/apt-cache.ja.8.xml
new file mode 100644
index 000000000..1d30e224d
--- /dev/null
+++ b/doc/ja/apt-cache.ja.8.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-cache</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-cache</refname>
+<!--
+ <refpurpose>APT package handling utility -\- cache manipulator</refpurpose>
+-->
+ <refpurpose>APT パッケージæ“作ユーティリティ -- キャッシュæ“作</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-cache</command>
+ <arg><option>-hvsn</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
+ <arg>gencaches</arg>
+ <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>stats</arg>
+ <arg>dump</arg>
+ <arg>dumpavail</arg>
+ <arg>unmet</arg>
+ <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
+ <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
+ <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+ <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-cache</command> performs a variety of operations on APT's package
+ cache. <command>apt-cache</command> does not manipulate the state of the system
+ but does provide operations to search and generate interesting output
+ from the package metadata.</para>
+-->
+ <para><command>apt-cache</command> 㯠APT ã®ãƒ‘ッケージキャッシュã«å¯¾ã—ã¦ã€
+ ã•ã¾ã–ã¾ãªæ“作を行ã„ã¾ã™ã€‚
+ <command>apt-cache</command> ã¯ã€ã‚·ã‚¹ãƒ†ãƒ çŠ¶æ…‹ã®æ“作ã¯è¡Œã„ã¾ã›ã‚“ãŒã€
+ パッケージã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šæ¤œç´¢ã—ãŸã‚Šã€
+ 興味深ã„出力を生æˆã™ã‚‹ã¨ã„ã£ãŸæ“作をæä¾›ã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除ãã€
+ 以下ã«æŒ™ã’るコマンドãŒå¿…è¦ã§ã™ã€‚</para>
+
+ <variablelist>
+<!--
+ <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+ <listitem><para><literal>add</literal> adds the named package index files to the package cache.
+ This is for debugging only.</para></listitem>
+-->
+ <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+ <listitem><para><literal>add</literal> ã¯ã€
+ パッケージキャッシュã«æŒ‡å®šã—ãŸãƒ‘ッケージインデックスファイルを追加ã—ã¾ã™ã€‚
+ デãƒãƒƒã‚°å°‚用ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>gencaches</term>
+<!--
+ <listitem><para><literal>gencaches</literal> performs the same operation as
+ <command>apt-get check</command>. It builds the source and package caches from
+ the sources in &sources-list; and from
+ <filename>/var/lib/dpkg/status</filename>.</para></listitem>
+-->
+ <listitem><para><literal>gencaches</literal> ã¯ã€
+ <command>apt-get check</command> ã¨åŒã˜å‹•ä½œã‚’æä¾›ã—ã¾ã™ã€‚
+ ã“れ㯠&sources-list; 内ã®å–å¾—å…ƒã¨
+ <filename>/var/lib/dpkg/status</filename>ã‹ã‚‰ã€
+ ソースã¨ãƒ‘ッケージã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚’構築ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>showpkg</literal> displays information about the packages listed on the
+ command line. Remaining arguments are package names. The available
+ versions and reverse dependencies of each package listed are listed, as
+ well as forward dependencies for each version. Forward (normal)
+ dependencies are those packages upon which the package in question
+ depends; reverse dependencies are those packages that depend upon the
+ package in question. Thus, forward dependencies must be satisfied for a
+ package, but reverse dependencies need not be.
+ For instance, <command>apt-cache showpkg libreadline2</command> would produce
+ output similar to the following:</para>
+-->
+ <listitem><para><literal>showpkg</literal> ã¯ã€
+ コマンドライン上ã«åˆ—挙ã—ãŸãƒ‘ッケージã®æƒ…報を表示ã—ã¾ã™ã€‚
+ 後ã«ç¶šã引数ã¯ãƒ‘ッケージåã¨ãªã‚Šã¾ã™ã€‚
+ å„パッケージã«ã¤ã„ã¦ã€æœ‰åŠ¹ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨è¢«ä¾å­˜é–¢ä¿‚を列挙ã—ã€
+ ã•ã‚‰ã«ãã®å„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¤ã„ã¦ä¾å­˜é–¢ä¿‚を表示ã—ã¾ã™ã€‚
+ (通常ã®) ä¾å­˜é–¢ä¿‚ã¨ã¯ã€å¯¾è±¡ã®ãƒ‘ッケージãŒä¾å­˜ã—ã¦ã„るパッケージを指ã—ã¾ã™ã€‚
+ ã¾ãŸã€è¢«ä¾å­˜é–¢ä¿‚ã¨ã¯ã€å¯¾è±¡ã®ãƒ‘ッケージã«ä¾å­˜ã—ã¦ã„るパッケージを指ã—ã¾ã™ã€‚
+ 従ã£ã¦ã€ãƒ‘ッケージã®ä¾å­˜é–¢ä¿‚ã¯æº€ãŸã•ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ãŒã€
+ 被ä¾å­˜é–¢ä¿‚ã¯æº€ãŸã™å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 実例ã¨ã—ã¦ã€ä»¥ä¸‹ã« <command>apt-cache showpkg libreadline2</command> ã®
+ 出力を掲ã’ã¾ã™ã€‚</para>
+
+<informalexample><programlisting>
+Package: libreadline2
+Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
+Reverse Depends:
+ libreadlineg2,libreadline2
+ libreadline2-altdev,libreadline2
+Dependencies:
+2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
+Provides:
+2.1-12 -
+Reverse Provides:
+</programlisting></informalexample>
+
+<!--
+ <para>Thus it may be seen that libreadline2, version 2.1-12, depends on
+ libc5 and ncurses3.0 which must be installed for libreadline2 to work.
+ In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
+ libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be
+ installed; libreadlineg2 and libreadline2-altdev do not have to be
+ installed. For the specific meaning of the remainder of the output it
+ is best to consult the apt source code.</para></listitem>
+ </varlistentry>
+-->
+ <para>ã¤ã¾ã‚Šã€libreadline2 ã® version 2.1-12 ã¯ã€
+ libc5 㨠ncurses3.0 ã«ä¾å­˜ã—ã¦ã„ã¦ã€libreadline2 ãŒå‹•ä½œã™ã‚‹ã«ã¯ã€
+ ã“れらをインストールã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã¨ã„ã†ã“ã¨ãŒåˆ¤ã‚Šã¾ã™ã€‚
+ 一方ã€libreadlineg2 㨠libreadline2-altdev 㯠libreadline2 ã«ä¾å­˜ã—ã¦ã„ã¾ã™ã€‚
+ libreadline2 をインストールã™ã‚‹ãŸã‚ã«ã¯ã€libc5, ncurses3.0, ldso ã‚’
+ ã™ã¹ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ãŒã€libreadlineg2 ã¨
+ libreadline2-altdev ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 出力ã®æ®‹ã‚Šã®éƒ¨åˆ†ã®æ„味ã«ã¤ã„ã¦ã¯ã€
+ apt ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’調ã¹ã‚‹ã®ãŒæœ€è‰¯ã§ã—ょã†ã€‚</para></listitem>
+ </varlistentry>
+
+<!--
+ <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache.
+ No further arguments are expected. Statistics reported are:
+-->
+ <varlistentry><term>stats</term><listitem><para><literal>stats</literal>
+ ã¯ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã«ã¤ã„ã¦ã®çµ±è¨ˆæƒ…報を表示ã—ã¾ã™ã€‚
+ ãれ以上ã€å¼•æ•°ã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。以下ã®çµ±è¨ˆæƒ…報を表示ã—ã¾ã™ã€‚
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Total package names</literal> is the number of package names found
+ in the cache.</para>
+ </listitem>
+-->
+ <listitem><para><literal>パッケージåç·æ•°</literal>ã¯ã€
+ キャッシュã«å­˜åœ¨ã™ã‚‹ãƒ‘ッケージ数を表ã—ã¾ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Normal packages</literal> is the number of regular, ordinary package
+ names; these are packages that bear a one-to-one correspondence between
+ their names and the names used by other packages for them in
+ dependencies. The majority of packages fall into this category.</para>
+ </listitem>
+-->
+ <listitem><para><literal>通常パッケージ</literal>ã¯ã€
+ å…¬å¼ã®æ™®é€šã®ãƒ‘ッケージ数を表ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€ä»–ã®ãƒ‘ッケージã®ä¾å­˜é–¢ä¿‚ã§ä½¿ç”¨ã•ã‚ŒãŸå称ã§ã€ãã‚ŒãŒä¸€å¯¾ä¸€ã«å¯¾å¿œ
+ ã™ã‚‹ãƒ‘ッケージã§ã™ã€‚
+ 大多数ã®ãƒ‘ッケージã¯ã“ã®ã‚«ãƒ†ã‚´ãƒªã«å…¥ã‚Šã¾ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist
+ only as a virtual package name; that is, packages only "provide" the
+ virtual package name, and no package actually uses the name. For
+ instance, "mail-transport-agent" in the Debian GNU/Linux system is a
+ pure virtual package; several packages provide "mail-transport-agent",
+ but there is no package named "mail-transport-agent".</para>
+ </listitem>
+-->
+ <listitem><para><literal>純粋仮想パッケージ</literal>ã¯ã€
+ 仮想パッケージåã¨ã—ã¦ã®ã¿å­˜åœ¨ã™ã‚‹ãƒ‘ッケージ
+ (仮想パッケージåã®ã¿ã‚’「æä¾›ã€ã—ã€
+ 実際ã«ã¯ã„ã‹ãªã‚‹ãƒ‘ッケージもãã®å称をæŒãŸãªã„) ã®æ•°ã‚’表ã—ã¾ã™ã€‚
+ 例ãˆã°ã€Debian GNU/Linux システムã§ã¯ "mail-transport-agent"
+ ã¯ç´”粋仮想パッケージã§ã™ã€‚
+ "mail-transport-agent" ã‚’æä¾›ã™ã‚‹ãƒ‘ッケージã¯ã„ãã¤ã‚‚ã‚ã‚Šã¾ã™ãŒã€
+ "mail-transport-agent" ã¨ã„ã†å称ã®ãƒ‘ッケージã¯ã‚ã‚Šã¾ã›ã‚“。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Single virtual packages</literal> is the number of packages with only
+ one package providing a particular virtual package. For example, in the
+ Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
+ only one package, xless, provides "X11-text-viewer".</para>
+ </listitem>
+-->
+ <listitem><para><literal>å˜ä¸€ä»®æƒ³ãƒ‘ッケージ</literal>ã¯ã€
+ 特定ã®ä»®æƒ³ãƒ‘ッケージåã‚’æä¾›ã™ã‚‹ãƒ‘ッケージãŒã€
+ ãŸã ä¸€ã¤ã®å ´åˆã®æ•°ã‚’表ã—ã¾ã™ã€‚
+ 例ãˆã°ã€Debian GNU/Linux システムã§ã¯ã€"X11-text-viewer"
+ ã¯ä»®æƒ³ãƒ‘ッケージã§ã™ãŒã€"X11-text-viewer" ã‚’æä¾›ã™ã‚‹ãƒ‘ッケージã¯ã€
+ xless パッケージã®ã¿ã¨ã„ã†ã“ã¨ã§ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either
+ provide a particular virtual package or have the virtual package name
+ as the package name. For instance, in the Debian GNU/Linux system,
+ "debconf" is both an actual package, and provided by the debconf-tiny
+ package.</para>
+ </listitem>
+-->
+ <listitem><para><literal>複åˆä»®æƒ³ãƒ‘ッケージ</literal>ã¯ã€
+ ãã®ä»®æƒ³ãƒ‘ッケージåã‚’æä¾›ã™ã‚‹ãƒ‘ッケージãŒè¤‡æ•°ã‚ã‚‹ã‹ã€
+ ã¾ãŸãƒ‘ッケージåã¨åŒã˜ä»®æƒ³ãƒ‘ッケージåã‚’æŒã¤ãƒ‘ッケージ数を表ã—ã¾ã™ã€‚
+ 例ãˆã°ã€Debian GNU/Linux システムã§ã¯ã€
+ debconf ã¯å®Ÿéš›ã®ãƒ‘ッケージåã§ã‚‚ã‚ã‚Šã¾ã™ãŒã€
+ debconf-tiny ã«ã‚ˆã£ã¦æ供もã•ã‚Œã¦ã„ã¾ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Missing</literal> is the number of package names that were referenced in
+ a dependency but were not provided by any package. Missing packages may
+ be in evidence if a full distribution is not accessed, or if a package
+ (real or virtual) has been dropped from the distribution. Usually they
+ are referenced from Conflicts statements.</para>
+ </listitem>
+-->
+ <listitem><para><literal>欠è½</literal>ã¯ã€ä¾å­˜é–¢ä¿‚中ã«ã¯å­˜åœ¨ã™ã‚‹ã®ã«ã€
+ ã©ã®ãƒ‘ッケージã«ã‚‚æä¾›ã•ã‚Œã¦ã„ãªã„パッケージåã®æ•°ã‚’表ã—ã¾ã™ã€‚
+ ã“ã®ãƒ‘ッケージãŒã‚ã‚‹ã¨ã„ã†ã“ã¨ã¯ã€
+ 全ディストリビューションã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¦ã„ãªã„ã‹ã€
+ (実ãªã„ã—仮想) パッケージãŒãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã‹ã‚‰ã¯ãšã•ã‚Œã¦ã—ã¾ã£ãŸå¯èƒ½æ€§ã‚‚ã‚ã‚Šã¾ã™ã€‚
+ 通常ã§ã¯ã€æ§‹æ–‡ãŒçŸ›ç›¾ã™ã‚‹ã¨ã“ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Total distinct</literal> versions is the number of package versions
+ found in the cache; this value is therefore at least equal to the
+ number of total package names. If more than one distribution (both
+ "stable" and "unstable", for instance), is being accessed, this value
+ can be considerably larger than the number of total package names.</para>
+ </listitem>
+-->
+ <listitem><para><literal>個別ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç·æ•°</literal>ã¯ã€
+ キャッシュã«å­˜åœ¨ã™ã‚‹ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ•°ã‚’表ã—ã¾ã™ã€‚
+ ãã®ãŸã‚ã€ã“ã®å€¤ã¯æœ€å°ã§ã‚‚パッケージåç·æ•°ã¨ä¸€è‡´ã—ã¾ã™ã€‚
+ ã‚‚ã—複数ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューション (例 "stable" 㨠"unstable" ã®ä¸¡æ–¹)
+ を利用ã—ãŸå ´åˆã€
+ ã“ã®å€¤ã¯ãƒ‘ッケージåç·æ•°ã‚ˆã‚Šã‚‚ã‹ãªã‚Šå¤§ãã„æ•°ã«ãªã‚Šã¾ã™ã€‚</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Total dependencies</literal> is the number of dependency relationships
+ claimed by all of the packages in the cache.</para>
+ </listitem>
+-->
+ <listitem><para><literal>ä¾å­˜é–¢ä¿‚ç·æ•°</literal>ã¯ã€
+ キャッシュã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ‘ッケージã§è¦æ±‚ã•ã‚ŒãŸä¾å­˜é–¢ä¿‚ã®æ•°ã§ã™ã€‚</para>
+ </listitem>
+ </itemizedlist>
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>showsrc</literal> displays all the source package records that match
+ the given package names. All versions are shown, as well as all
+ records that declare the name to be a Binary.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>showsrc</literal> ã¯ã€
+ 指定ã—ãŸãƒ‘ッケージåã«ä¸€è‡´ã™ã‚‹ã‚½ãƒ¼ã‚¹ãƒ‘ッケージをã€ã™ã¹ã¦è¡¨ç¤ºã—ã¾ã™ã€‚
+ ãƒã‚¤ãƒŠãƒªã«ãªã‚‹ã¨ãã®å称を宣言ã—ãŸãƒ¬ã‚³ãƒ¼ãƒ‰ã¨åŒæ§˜ã«ã€
+ ã™ã¹ã¦ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¤ã„ã¦è¡¨ç¤ºã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dump</term>
+<!--
+ <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is
+ primarily for debugging.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>dump</literal> ã¯ã€
+ キャッシュ内ã®ãƒ‘ッケージãã‚Œãžã‚Œã«ã¤ã„ã¦ã€çŸ­ã„一覧を表示ã—ã¾ã™ã€‚
+ 主ã«ãƒ‡ãƒãƒƒã‚°ç”¨ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dumpavail</term>
+<!--
+ <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is
+ suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem>
+-->
+ <listitem><para><literal>dumpavail</literal> ã¯ã€
+ 標準出力ã«åˆ©ç”¨å¯èƒ½ãªã‚‚ã®ã®ä¸€è¦§ã‚’出力ã—ã¾ã™ã€‚
+ &dpkg; ã¨å…±ã«ä½¿ç”¨ã™ã‚‹ã¨ä¾¿åˆ©ã§ã™ã—ã€
+ &dselect; ã§ã‚‚使用ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>unmet</term>
+<!--
+ <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the
+ package cache.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>unmet</literal> ã¯ã€
+ パッケージキャッシュ内ã«ã‚ã‚‹ã€
+ ä¸é©å½“ãªä¾å­˜é–¢ä¿‚ã®æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>show</literal> performs a function similar to
+ <command>dpkg -\-print-avail</command>; it displays the package records for the
+ named packages.</para></listitem>
+-->
+ <listitem><para><literal>show</literal> ã¯ã€
+ <command>dpkg --print-avail</command> ã¨åŒæ§˜ã®æ©Ÿèƒ½ã‚’実行ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€æŒ‡å®šã—ãŸãƒ‘ッケージã®ãƒ‘ッケージレコードã®è¡¨ç¤ºã§ã™ã€‚</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term>
+<!--
+ <listitem><para><literal>search</literal> performs a full text search on all available package
+ lists for the regex pattern given. It searches the package names and the
+ descriptions for an occurrence of the regular expression and prints out
+ the package name and the short description. If <option>-\-full</option> is given
+ then output identical to <literal>show</literal> is produced for each matched
+ package, and if <option>-\-names-only</option> is given then the long description
+ is not searched, only the package name is.</para>
+-->
+ <listitem><para><literal>search</literal> ã¯ã€ä¸Žãˆã‚‰ã‚ŒãŸæ­£è¦è¡¨ç¾ã«ã‚ˆã£ã¦ã€
+ ã™ã¹ã¦ã®åˆ©ç”¨å¯èƒ½ãªãƒ‘ッケージã«å¯¾ã—ã¦å…¨æ–‡æ¤œç´¢ã‚’è¡Œã„ã¾ã™ã€‚
+ パッケージåã¨èª¬æ˜Žã«å¯¾ã—ã¦æ¤œç´¢ã‚’è¡Œã„ã€
+ パッケージåã¨çŸ­ã„説明文を表示ã—ã¾ã™ã€‚
+ <option>--full</option> ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã€ãƒžãƒƒãƒã—ãŸãƒ‘ッケージã«å¯¾ã—
+ <literal>show</literal> ã¨åŒã˜æƒ…報を出力ã—ã¾ã™ã€‚
+ <option>--names-only</option> ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã¯ã€
+ 説明文ã«å¯¾ã—ã¦æ¤œç´¢ã‚’è¡Œã‚ãšã€ãƒ‘ッケージåã«å¯¾ã—ã¦ã®ã¿å¯¾è±¡ã¨ã—ã¾ã™ã€‚</para>
+ <para>
+<!--
+ Separate arguments can be used to specify multiple search patterns that
+ are and'ed together.</para></listitem>
+-->
+ 空白ã§åŒºåˆ‡ã£ãŸå¼•æ•°ã§ã€
+ 複数ã®æ¤œç´¢ãƒ‘ターン㮠and ã‚’ã¨ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>depends <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>depends</literal> shows a listing of each dependency a package has
+ and all the possible other packages that can fulfill that dependency.</para></listitem>
+-->
+ <listitem><para><literal>depends</literal> ã¯ã€
+ パッケージãŒæŒã£ã¦ã„ã‚‹ä¾å­˜é–¢ä¿‚ã¨ã€
+ ãã®ä¾å­˜é–¢ä¿‚を満ãŸã™ä»–ã®ãƒ‘ッケージã®ä¸€è¦§ã‚’表示ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
+ package has.</para></listitem>
+-->
+ <listitem><para><literal>rdepends</literal> ã¯ã€
+ パッケージãŒæŒã¤è¢«ä¾å­˜é–¢ä¿‚を一覧表示ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term>
+<!--
+ <listitem><para>This command prints the name of each package in the system. The optional
+ argument is a prefix match to filter the name list. The output is suitable
+ for use in a shell tab complete function and the output is generated
+ extremely quickly. This command is best used with the
+ <option>-\-generate</option> option.</para></listitem>
+-->
+ <listitem><para>ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€
+ システムã§ã®å„パッケージã®å称を表示ã—ã¾ã™ã€‚
+ オプションã®å¼•æ•°ã«ã‚ˆã‚Šã€å–å¾—ã™ã‚‹ä¸€è¦§ã‚ˆã‚Šå…ˆé ­ä¸€è‡´ã§æŠ½å‡ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ ã“ã®å‡ºåŠ›ã¯ã‚·ã‚§ãƒ«ã®ã‚¿ãƒ–ã«ã‚ˆã‚‹è£œå®Œæ©Ÿèƒ½ã«ä½¿ã„ã‚„ã™ãã€
+ ã¾ãŸéžå¸¸ã«é€Ÿã生æˆã•ã‚Œã¾ã™ã€‚
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ <option>--generate</option> オプションã¨å…±ã«ä½¿ç”¨ã™ã‚‹ã¨ã€
+ éžå¸¸ã«ä¾¿åˆ©ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>dotty</literal> takes a list of packages on the command line and
+ generates output suitable for use by dotty from the
+ <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+ package. The result will be a set of nodes and edges representing the
+ relationships between the packages. By default the given packages will
+ trace out all dependent packages; this can produce a very large graph.
+ To limit the output to only the packages listed on the command line,
+ set the <literal>APT::Cache::GivenOnly</literal> option.</para>
+-->
+ <listitem><para><literal>dotty</literal> ã¯ã€
+ コマンドライン上ã®ãƒ‘ッケージåã‹ã‚‰ã€
+ <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+ パッケージ㮠dotty コマンドã§åˆ©ç”¨ã™ã‚‹ã®ã«ä¾¿åˆ©ãªå‡ºåŠ›ã‚’生æˆã—ã¾ã™ã€‚
+ çµæžœã¯ãƒ‘ッケージã®é–¢ä¿‚を表ã‚ã™ã€ãƒŽãƒ¼ãƒ‰ãƒ»ã‚¨ãƒƒã‚¸ã®ã‚»ãƒƒãƒˆã§è¡¨ç¾ã•ã‚Œã¾ã™ã€‚
+ デフォルトã§ã¯ã€ã™ã¹ã¦ã®ä¾å­˜ãƒ‘ッケージをトレースã™ã‚‹ã®ã§ã€
+ éžå¸¸ã«å¤§ãã„図ãŒå¾—られã¾ã™ã€‚
+ ã“ã‚Œã¯ã€<literal>APT::Cache::GivenOnly</literal>
+ オプションを設定ã—ã¦è§£é™¤ã§ãã¾ã™ã€‚</para>
+
+<!--
+ <para>The resulting nodes will have several shapes; normal packages are boxes,
+ pure provides are triangles, mixed provides are diamonds,
+ missing packages are hexagons. Orange boxes mean recursion was stopped
+ [leaf packages], blue lines are pre-depends, green lines are conflicts.</para>
+-->
+ <para>çµæžœã®ãƒŽãƒ¼ãƒ‰ã¯æ•°ç¨®ã®å½¢çŠ¶ã‚’ã¨ã‚Šã¾ã™ã€‚
+ 通常パッケージã¯å››è§’ã€ç´”粋仮想パッケージã¯ä¸‰è§’ã€è¤‡åˆä»®æƒ³ãƒ‘ッケージã¯è±å½¢ã€
+ 六角形ã¯æ¬ è½ãƒ‘ッケージをãã‚Œãžã‚Œè¡¨ã—ã¾ã™ã€‚
+ オレンジã®å››è§’ã¯å†å¸°ãŒçµ‚了ã—ãŸã€Œãƒªãƒ¼ãƒ•ãƒ‘ッケージã€ã€é’ã„ç·šã¯å…ˆè¡Œä¾å­˜ã€
+ ç·‘ã®ç·šã¯ç«¶åˆã‚’表ã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
+-->
+ <para>注æ„) dotty ã¯ã€
+ パッケージã®ã‚ˆã‚Šå¤§ããªã‚»ãƒƒãƒˆã®ã‚°ãƒ©ãƒ•ã¯æã‘ã¾ã›ã‚“。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
+<!--
+ <listitem><para><literal>policy</literal> is meant to help debug issues relating to the
+ preferences file. With no arguments it will print out the
+ priorities of each source. Otherwise it prints out detailed information
+ about the priority selection of the named package.</para></listitem>
+-->
+ <listitem><para><literal>policy</literal> ã¯ã€
+ 設定ファイル関係ã®å•é¡Œã«ã¤ã„ã¦ã€ãƒ‡ãƒãƒƒã‚°ã‚’支æ´ã—ã¾ã™ã€‚
+ 引数を指定ã—ãªã‹ã£ãŸå ´åˆã€å–å¾—å…ƒã”ã¨ã®å„ªå…ˆé †ä½ã‚’表示ã—ã¾ã™ã€‚
+ 一方ã€ãƒ‘ッケージåを指定ã—ãŸå ´åˆã€
+ 優先順ã®è©³ç´°æƒ…報を表示ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>madison <replaceable>/[ pkg(s) ]</replaceable></term>
+<!--
+ <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic
+ the output format and a subset of the functionality of the Debian
+ archive management tool, <literal>madison</literal>. It displays
+ available versions of a package in a tabular format. Unlike the
+ original <literal>madison</literal>, it can only display information for
+ the architecture for which APT has retrieved package lists
+ (<literal>APT::Architecture</literal>).</para></listitem>
+-->
+ <listitem><para><literal>apt-cache</literal> ã® <literal>madison</literal>
+ コマンドã¯ã€Debian アーカイブ管ç†ãƒ„ール <literal>madison</literal>
+ ã®æ©Ÿèƒ½ã®ã‚µãƒ–セットã§ã€å‡ºåŠ›ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’真似よã†ã¨ã—ã¾ã™ã€‚
+ パッケージã®åˆ©ç”¨å¯èƒ½ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表形å¼ã§è¡¨ç¤ºã—ã¾ã™ã€‚
+ オリジナル㮠<literal>madison</literal> ã¨é•ã„ã€
+ APT ãŒãƒ‘ッケージ一覧を検索ã—ãŸã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£
+ (<literal>APT::Architecture</literal>)
+ ã®æƒ…報を表示ã™ã‚‹ã ã‘ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-p</option></term><term><option>--pkg-cache</option></term>
+<!--
+ <listitem><para>Select the file to store the package cache. The package cache is the
+ primary cache used by all operations.
+ Configuration Item: <literal>Dir::Cache::pkgcache</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージキャッシュを格ç´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™ã€‚
+ パッケージキャッシュã¯ã€ã™ã¹ã¦ã®æ“作ã§ä½¿ç”¨ã•ã‚Œã‚‹ä¸€æ¬¡ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã§ã™ã€‚
+ 設定項目 - <literal>Dir::Cache::pkgcache</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term><term><option>--src-cache</option></term>
+<!--
+ <listitem><para>Select the file to store the source cache. The source is used only by
+ <literal>gencaches</literal> and it stores a parsed version of the package
+ information from remote sources. When building the package cache the
+ source cache is used to advoid reparsing all of the package files.
+ Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem>
+-->
+ <listitem><para>ソースキャッシュを格ç´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™ã€‚
+ ã“ã®ã‚½ãƒ¼ã‚¹ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã¯ <literal>gencaches</literal> ã§ã®ã¿ä½¿ç”¨ã•ã‚Œã€
+ ã“ã“ã«è§£æžã•ã‚ŒãŸå–å¾—å…ƒã®ãƒ‘ッケージ情報ãŒæ ¼ç´ã•ã‚Œã¦ã„ã¾ã™ã€‚
+ パッケージキャッシュを構築ã™ã‚‹éš›ã«ã€ã‚½ãƒ¼ã‚¹ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã¯ã€
+ 全パッケージファイルをå†è§£æžã‚’é¿ã‘る上ã§ä¾¿åˆ©ã§ã™ã€‚
+ <!--advoid 㯠avoid ã®ãƒŸã‚¹ã‚¹ãƒšãƒ«ï¼Ÿ -->
+ 設定項目 - <literal>Dir::Cache::srcpkgcache</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+ <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quietness up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quietness level, overriding the configuration file.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ <listitem><para>é™ç²› - 進æ—表示をçœç•¥ã—ã€
+ ログをã¨ã‚‹ã®ã«ä¾¿åˆ©ãªå‡ºåŠ›ã‚’è¡Œã„ã¾ã™ã€‚
+ 最大 2 ã¤ã¾ã§ q ã‚’é‡ã­ã‚‹ã“ã¨ã§ã•ã‚‰ã«é™ç²›ã«ã§ãã¾ã™ã€‚
+ ã¾ãŸã€<option>-q=#</option> ã®ã‚ˆã†ã«é™ç²›ãƒ¬ãƒ™ãƒ«ã‚’指定ã—ã¦ã€
+ 設定ファイルを上書ãã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-i</option></term><term><option>--important</option></term>
+<!--
+ <listitem><para>Print only important dependencies; for use with unmet. Causes only Depends and
+ Pre-Depends relations to be printed.
+ Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem>
+-->
+ <listitem><para>「é‡è¦ã€ä¾å­˜é–¢ä¿‚ã®ã¿è¡¨ç¤º - unmet ã¨å…±ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€Œä¾å­˜ã€é–¢ä¿‚ã¨ã€Œå…ˆè¡Œä¾å­˜ã€é–¢ä¿‚ã®ã¿ã‚’表示ã™ã‚‹ãŸã‚ã§ã™ã€‚
+ 設定項目 - <literal>APT::Cache::Important</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--full</option></term>
+<!--
+ <listitem><para>Print full package records when searching.
+ Configuration Item: <literal>APT::Cache::ShowFull</literal>.</para></listitem>
+-->
+ <listitem><para>search 時ã«å…¨ãƒ‘ッケージレコードを表示ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::ShowFull</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-a</option></term><term><option>--all-versions</option></term>
+<!--
+ <listitem><para>Print full records for all available versions. This is the
+ default; to turn it off, use <option>-\-no-all-versions</option>.
+ If <option>-\-no-all-versions</option> is specified, only the candidate version
+ will displayed (the one which would be selected for installation).
+ This option is only applicable to the <literal>show</literal> command.
+ Configuration Item: <literal>APT::Cache::AllVersions</literal>.</para></listitem>
+-->
+ <listitem><para>全利用å¯èƒ½ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ¬ã‚³ãƒ¼ãƒ‰å…¨ä½“を表示ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®å‹•ä½œã§ã€
+ 無効ã«ã™ã‚‹ã«ã¯ <option>--no-all-versions</option> を使用ã—ã¦ãã ã•ã„。
+ <option>--no-all-versions</option> を指定ã™ã‚‹ã¨ã€
+ 候補ãƒãƒ¼ã‚¸ãƒ§ãƒ³ (インストールã®éš›ã«é¸æŠžã•ã‚Œã‚‹ã‚‚ã®) ã ã‘表示ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションã¯ã€show コマンドã§ã®ã¿é©ç”¨ã§ãã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::AllVersions</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-g</option></term><term><option>--generate</option></term>
+<!--
+ <listitem><para>Perform automatic package cache regeneration, rather than use the cache
+ as it is. This is the default; to turn it off, use <option>-\-no-generate</option>.
+ Configuration Item: <literal>APT::Cache::Generate</literal>.</para></listitem>
+-->
+ <listitem><para>ãã®ã¾ã¾ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚’使用ã™ã‚‹ã®ã§ã¯ãªãã€
+ 自動的ã«ãƒ‘ッケージキャッシュをå†ç”Ÿæˆã—ã¾ã™ã€‚ã“ã‚Œã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®å‹•ä½œã§ã€
+ 無効ã«ã™ã‚‹ã«ã¯ <option>--no-generate</option> を使用ã—ã¦ãã ã•ã„。
+ 設定項目 - <literal>APT::Cache::Generate</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--names-only</option></term><term><option>-n</option></term>
+<!--
+ <listitem><para>Only search on the package names, not the long descriptions.
+ Configuration Item: <literal>APT::Cache::NamesOnly</literal>.</para></listitem>
+-->
+ <listitem><para>説明文ã§ã¯ãªãã€ãƒ‘ッケージåã‹ã‚‰ã®ã¿æ¤œç´¢ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::NamesOnly</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--all-names</option></term>
+<!--
+ <listitem><para>Make <literal>pkgnames</literal> print all names, including virtual packages
+ and missing dependencies.
+ Configuration Item: <literal>APT::Cache::AllNames</literal>.</para></listitem>
+-->
+ <listitem><para><literal>pkgnames</literal> ã§ã€
+ 仮想パッケージや欠è½ä¾å­˜é–¢ä¿‚ã‚’å«ã‚ãŸå…¨å称を表示ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::AllNames</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--recurse</option></term>
+<!--
+ <listitem><para>Make <literal>depends</literal> and <literal>rdepends</literal> recursive so
+ that all packages mentioned are printed once.
+ Configuration Item: <literal>APT::Cache::RecurseDepends</literal>.</para></listitem>
+-->
+ <listitem><para><literal>depends</literal> ã‚„ <literal>rdepends</literal>
+ ã§ã€æŒ‡å®šã—ãŸå…¨ãƒ‘ッケージをå†å¸°çš„ã«ä¸€åº¦ã«è¡¨ç¤ºã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::RecurseDepends</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--installed</option></term>
+<!--
+ <listitem><para>
+ Limit the output of <literal>depends</literal> and <literal>rdepends</literal> to
+ packages which are currently installed.
+ Configuration Item: <literal>APT::Cache::Installed</literal>.</para></listitem>
+-->
+ <listitem><para>
+ <literal>depends</literal> ã‚„ <literal>rdepends</literal> ã®å‡ºåŠ›ã‚’ã€
+ ç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„るパッケージã«é™å®šã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Cache::Installed</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+ <listitem><para>Locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージã®å–得元。
+ 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+ <listitem><para>Storage area for state information for each package resource specified in
+ &sources-list;
+ Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+ <listitem><para>&sources-list; ã«æŒ‡å®šã—ãŸã€
+ パッケージリソースã”ã¨ã®çŠ¶æ…‹æƒ…報格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+ <listitem><para>Storage area for state information in transit.
+ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+ <listitem><para>å–得中状態情報格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::State::Lists</literal> (必然的ã«ä¸å®Œå…¨)</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;, &sources-list;, &apt-get;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-cache</command> returns zero on normal operation, decimal 100 on error.
+ </para>
+-->
+ <para><command>apt-cache</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+</refentry>
diff --git a/doc/ja/apt-cdrom.ja.8.sgml b/doc/ja/apt-cdrom.ja.8.sgml
deleted file mode 100644
index 4328ef8c2..000000000
--- a/doc/ja/apt-cdrom.ja.8.sgml
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.3 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-cdrom</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-cdrom</>
-<!--
- <refpurpose>APT CDROM managment utility</>
--->
- <refpurpose>APT CDROM ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-cdrom</>
- <arg><option>-hvrmfan</></arg>
- <arg><option>-d=<replaceable/cdrom mount point/</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>add</>
- <arg>ident</>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>ÀâÌÀ</>
- <para>
-<!--
- <command/apt-cdrom/ is used to add a new CDROM to APTs list of available
- sources. <command/apt-cdrom/ takes care of determining the structure of
- the disc as well as correcting for several possible mis-burns and
- verifying the index files.
--->
- <command/apt-cdrom/ ¤ÏÍøÍѲÄǽ¤Ê¼èÆÀ¸µ¤È¤·¤Æ¡¢APT ¤Î¥ê¥¹¥È¤Ë¿·¤·¤¤ CDROM ¤ò
- Äɲ乤ë¤Î¤ËÊØÍø¤Ç¤¹¡£<command/apt-cdrom/ ¤Ï¾Æ¤­Â»¤¸¤ò²Äǽ¤Ê¸Â¤êÊäÀµ¤·¡¢
- ¥Ç¥£¥¹¥¯¹½Â¤¤Î³Îǧ¤ò½õ¤±¤Þ¤¹¡£¤Þ¤¿¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î³Îǧ¤ò¹Ô¤¤¤Þ¤¹¡£
- <para>
-<!--
- It is necessary to use <command/apt-cdrom/ to add CDs to the APT system,
- it cannot be done by hand. Furthermore each disk in a multi-cd set must be
- inserted and scanned separately to account for possible mis-burns.
--->
- APT ¥·¥¹¥Æ¥à¤Ç CD ¤òÄɲ乤ë¤Î¤Ï¼êºî¶È¤Ç¤ÏÆñ¤·¤¤¤¿¤á¡¢<command/apt-cdrom/
- ¤¬É¬ÍפǤ¹¡£¤½¤Î¾å¡¢CD ¥»¥Ã¥È¤Î¥Ç¥£¥¹¥¯¤ò 1 Ëç¤Å¤Ä¡¢¾Æ¤­Â»¤¸¤òÊäÀµ¤Ç¤­¤ë¤«
- ɾ²Á¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- <para>
-<!--
- Unless the <option/-h/, or <option/- -help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ ¤ä <option/--help/ ¤ò½ü¤­¡¢°Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£
- <VariableList>
- <VarListEntry><Term>add</Term>
- <ListItem><Para>
-<!--
- <literal/add/ is used to add a new disc to the source list. It will unmount the
- CDROM device, prompt for a disk to be inserted and then procceed to
- scan it and copy the index files. If the disc does not have a proper
- <filename>.disk/</> directory you will be prompted for a descriptive
- title.
--->
- <literal/add/ ¤Ï¡¢¿·¤·¤¤¥Ç¥£¥¹¥¯¤ò¼èÆÀ¸µ¥ê¥¹¥È¤ËÄɲä·¤Þ¤¹¡£
- CDROM ¥Ç¥Ð¥¤¥¹¤Î¥¢¥ó¥Þ¥¦¥ó¥È¡¢¥Ç¥£¥¹¥¯ÁÞÆþ¤Î¥×¥í¥ó¥×¥È¤Îɽ¼¨¤Î¸å¤Ë¡¢
- ¥Ç¥£¥¹¥¯¤Î¥¹¥­¥ã¥ó¤È¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò¹Ô¤¤¤Þ¤¹¡£
- ¥Ç¥£¥¹¥¯¤ËÀµ¤·¤¤ <filename>.disk/</> ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢
- ¥¿¥¤¥È¥ë¤òÆþÎϤ¹¤ë¤è¤¦Â¥¤·¤Þ¤¹¡£
- <para>
-<!--
- APT uses a CDROM ID to track which disc is currently in the drive and
- maintains a database of these IDs in
- <filename>&statedir;/cdroms.list</>
--->
- APT ¤Ï¡¢¸½ºß¥É¥é¥¤¥Ö¤Ë¤¢¤ë¥Ç¥£¥¹¥¯¤Î¥È¥é¥Ã¥¯¤«¤é¼èÆÀ¤·¤¿¡¢CDROM ID ¤ò
- »ÈÍѤ·¤Þ¤¹¡£¤Þ¤¿¤½¤Î ID ¤ò¡¢<filename>&statedir;/cdroms.list</> Æâ¤Î
- ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç´ÉÍý¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>ident</Term>
- <ListItem><Para>
-<!--
- A debugging tool to report the identity of the current disc as well
- as the stored file name
--->
- ³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë̾¤È¡¢¸½ºß¤Î¥Ç¥£¥¹¥¯¤¬Æ±°ì¤«¤É¤¦¤«¤ò¥ì¥Ý¡¼¥È¤¹¤ë¡¢
- ¥Ç¥Ð¥Ã¥°¥Ä¡¼¥ë¤Ç¤¹¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>¥ª¥×¥·¥ç¥ó</>
-
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-d/</><term><option/--cdrom/</>
- <ListItem><Para>
-<!--
- Mount point; specify the location to mount the cdrom. This mount
- point must be listed in <filename>/etc/fstab</> and propely configured.
- Configuration Item: <literal/Acquire::cdrom::mount/.
--->
- ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È - cdrom ¤ò¥Þ¥¦¥ó¥È¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
- ¤³¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ï¡¢<filename>/etc/fstab</> ¤ËÀµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ë
- ɬÍפ¬¤¢¤ê¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/Acquire::cdrom::mount/
- </VarListEntry>
-
- <VarListEntry><term><option/-r/</><term><option/--rename/</>
- <ListItem><Para>
-<!--
- Rename a disc; change the label of a disk or override the disks
- given label. This option will cause <command/apt-cdrom/ to prompt for
- a new label.
- Configuration Item: <literal/APT::CDROM::Rename/.
--->
- ¥Ç¥£¥¹¥¯¤Î̾Á°Êѹ¹ - »ØÄꤷ¤¿Ì¾Á°¤Ç¥Ç¥£¥¹¥¯¤Î¥é¥Ù¥ë¤òÊѹ¹¡¦¹¹¿·¤·¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢<command/apt-cdrom/ ¤¬¿·¤·¤¤¥é¥Ù¥ë¤òÆþÎϤ¹¤ë¤è¤¦
- Â¥¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::CDROM::Rename/
- </VarListEntry>
-
- <VarListEntry><term><option/-m/</><term><option/--no-mount/</>
- <ListItem><Para>
-<!--
- No mounting; prevent <command/apt-cdrom/ from mounting and unmounting
- the mount point.
- Configuration Item: <literal/APT::CDROM::NoMount/.
--->
- ¥Þ¥¦¥ó¥È¤Ê¤· - <command/apt-cdrom/ ¤¬¡¢¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ë
- ¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¤¹¤ë¤Î¤òËɤ®¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::CDROM::NoMount/
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--fast/</>
- <ListItem><Para>
-<!--
- Fast Copy; Assume the package files are valid and do not check
- every package. This option should be used only if
- <command/apt-cdrom/ has been run on this disc before and did not detect
- any errors.
- Configuration Item: <literal/APT::CDROM::Fast/.
--->
- ¹â®¥³¥Ô¡¼ - ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬ÂÅÅö¤Ç¤¢¤ë¤È²¾Äꤷ¡¢
- ¥Á¥§¥Ã¥¯¤òÁ´¤¯¹Ô¤¤¤Þ¤»¤ó¡£¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¤³¤Î¥Ç¥£¥¹¥¯¤Ç°ÊÁ° <command/apt-cdrom/ ¤ò¹Ô¤Ã¤Æ¤ª¤ê¡¢
- ¥¨¥é¡¼¤ò¸¡½Ð¤·¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¤ß»ÈÍѤ¹¤Ù¤­¤Ç¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::CDROM::Fast/
- </VarListEntry>
-
- <VarListEntry><term><option/-a/</><term><option/--thorough/</>
- <ListItem><Para>
-<!--
- Thorough Package Scan; This option may be needed with some old
- Debian 1.1/1.2 discs that have Package files in strange places. It
- takes much longer to scan the CD but will pick them all up.
--->
- ´°Á´¥Ñ¥Ã¥±¡¼¥¸¥¹¥­¥ã¥ó - ¸Å¤¤ Debian 1.1/1.2 ¤Î¥Ç¥£¥¹¥¯¤Ï¡¢
- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬°ã¤¦¾ì½ê¤Ë¤¢¤ë¤¿¤á¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦É¬Íפ¬
- ¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- CD ¤ò¥¹¥­¥ã¥ó¤¹¤ë¤Î¤ËÈó¾ï¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ò
- Ãê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><term><option/-n/</>
- <term><option/--just-print/</>
- <term><option/--recon/</>
- <term><option/--no-act/</>
- <ListItem><Para>
-<!--
- No Changes; Do not change the &sources-list; file and do not
- write index files. Everything is still checked however.
- Configuration Item: <literal/APT::CDROM::NoAct/.
--->
- Êѹ¹¤Ê¤· - &sources-list; ¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤ä¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î
- ½ñ¤­¹þ¤ß¤ò¹Ô¤¤¤Þ¤»¤ó¡£¤È¤Ï¤¤¤¨¡¢¤¹¤Ù¤Æ¤Î¥Á¥§¥Ã¥¯¤Ï¹Ô¤ï¤ì¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::CDROM::NoAct/
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>´ØÏ¢¹àÌÜ</>
- <para>
- &apt-conf;, &apt-get;, &sources-list;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>¿ÇÃÇ¥á¥Ã¥»¡¼¥¸</>
- <para>
-<!--
- <command/apt-cdrom/ returns zero on normal operation, decimal 100 on error.
--->
- <command/apt-get/ ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£
- ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
-
diff --git a/doc/ja/apt-cdrom.ja.8.xml b/doc/ja/apt-cdrom.ja.8.xml
new file mode 100644
index 000000000..bf84b4749
--- /dev/null
+++ b/doc/ja/apt-cdrom.ja.8.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <date>14 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-cdrom</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-cdrom</refname>
+<!--
+ <refpurpose>APT CDROM management utility</refpurpose>
+-->
+ <refpurpose>APT CDROM 管ç†ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-cdrom</command>
+ <arg><option>-hvrmfan</option></arg>
+ <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group>
+ <arg>add</arg>
+ <arg>ident</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
+ of available sources. <command>apt-cdrom</command> takes care of
+ determining the structure of
+ the disc as well as correcting for several possible mis-burns and
+ verifying the index files.
+ </para>
+-->
+ <para><command>apt-cdrom</command> ã¯åˆ©ç”¨å¯èƒ½ãªå–å¾—å…ƒã¨ã—ã¦ã€
+ APT ã®ãƒªã‚¹ãƒˆã«æ–°ã—ã„ CDROM を追加ã™ã‚‹ã®ã«ä¾¿åˆ©ã§ã™ã€‚
+ <command>apt-cdrom</command> ã¯ç„¼ãæã˜ã‚’å¯èƒ½ãªé™ã‚Šè£œæ­£ã—ã€
+ ディスク構造ã®ç¢ºèªã‚’助ã‘ã¾ã™ã€‚ã¾ãŸã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®ç¢ºèªã‚’è¡Œã„ã¾ã™ã€‚
+ </para>
+
+<!--
+ <para>It is necessary to use <command>apt-cdrom</command> to add CDs to the
+ APT system,
+ it cannot be done by hand. Furthermore each disk in a multi-cd set must be
+ inserted and scanned separately to account for possible mis-burns.
+ </para>
+-->
+ <para>APT システムã«æ‰‹ä½œæ¥­ã§ CD を追加ã™ã‚‹ã®ã¯é›£ã—ã„ãŸã‚ã€
+ <command>apt-cdrom</command> ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+ ãã®ä¸Šã€CD セットã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚’ 1 æžšã¥ã¤ã€
+ 焼ãæã˜ã‚’補正ã§ãã‚‹ã‹è©•ä¾¡ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ </para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+ given one of the commands below must be present.
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除ãã€
+ 以下ã«æŒ™ã’るコマンドãŒå¿…è¦ã§ã™ã€‚
+
+ <variablelist>
+ <varlistentry><term>add</term>
+<!--
+ <listitem><para><literal>add</literal> is used to add a new disc to the
+ source list. It will unmount the
+ CDROM device, prompt for a disk to be inserted and then procceed to
+ scan it and copy the index files. If the disc does not have a proper
+ <filename>disk</filename> directory you will be prompted for a descriptive
+ title.
+-->
+ <listitem><para><literal>add</literal> ã¯ã€
+ æ–°ã—ã„ディスクをå–得元リストã«è¿½åŠ ã—ã¾ã™ã€‚
+ CDROM デãƒã‚¤ã‚¹ã®ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã€ãƒ‡ã‚£ã‚¹ã‚¯æŒ¿å…¥ã®ãƒ—ロンプトã®è¡¨ç¤ºã®å¾Œã«ã€
+ ディスクã®ã‚¹ã‚­ãƒ£ãƒ³ã¨ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを行ã„ã¾ã™ã€‚
+ ディスクã«æ­£ã—ã„ <filename>disk</filename> ディレクトリãŒå­˜åœ¨ã—ãªã„å ´åˆã€
+ タイトルを入力ã™ã‚‹ã‚ˆã†ä¿ƒã—ã¾ã™ã€‚
+ </para>
+
+<!--
+ <para>APT uses a CDROM ID to track which disc is currently in the drive and
+ maintains a database of these IDs in
+ <filename>&statedir;/cdroms.list</filename>
+-->
+ <para>APT ã¯ã€ç¾åœ¨ãƒ‰ãƒ©ã‚¤ãƒ–ã«ã‚るディスクã®ãƒˆãƒ©ãƒƒã‚¯ã‹ã‚‰å–å¾—ã—ãŸã€
+ CDROM ID を使用ã—ã¾ã™ã€‚ã¾ãŸãã® ID ã‚’ã€
+ <filename>&statedir;/cdroms.list</filename> 内ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã§ç®¡ç†ã—ã¾ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>ident</term>
+<!--
+ <listitem><para>A debugging tool to report the identity of the current
+ disc as well as the stored file name
+-->
+ <listitem><para>æ ¼ç´ã•ã‚Œã¦ã„るファイルåã¨ã€
+ ç¾åœ¨ã®ãƒ‡ã‚£ã‚¹ã‚¯ãŒåŒä¸€ã‹ã©ã†ã‹ã‚’レãƒãƒ¼ãƒˆã™ã‚‹ã€ãƒ‡ãƒãƒƒã‚°ãƒ„ールã§ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1><title>Options</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term>
+<!--
+ <listitem><para>Mount point; specify the location to mount the cdrom. This
+ mount point must be listed in <filename>/etc/fstab</filename> and
+ properly configured.
+ Configuration Item: <literal>Acquire::cdrom::mount</literal>.
+-->
+ <listitem><para>マウントãƒã‚¤ãƒ³ãƒˆ - cdrom をマウントã™ã‚‹å ´æ‰€ã‚’指定ã—ã¾ã™ã€‚
+ ã“ã®ãƒžã‚¦ãƒ³ãƒˆãƒã‚¤ãƒ³ãƒˆã¯ã€
+ <filename>/etc/fstab</filename> ã«æ­£ã—ã設定ã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ 設定項目 - <literal>Acquire::cdrom::mount</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-r</option></term><term><option>--rename</option></term>
+<!--
+ <listitem><para>Rename a disc; change the label of a disk or override the
+ disks given label. This option will cause <command>apt-cdrom</command> to
+ prompt for a new label.
+ Configuration Item: <literal>APT::CDROM::Rename</literal>.
+-->
+ <listitem><para>ディスクã®åå‰å¤‰æ›´ -
+ 指定ã—ãŸåå‰ã§ãƒ‡ã‚£ã‚¹ã‚¯ã®ãƒ©ãƒ™ãƒ«ã‚’変更・更新ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚Šã€
+ <command>apt-cdrom</command> ãŒæ–°ã—ã„ラベルを入力ã™ã‚‹ã‚ˆã†ä¿ƒã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::CDROM::Rename</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-m</option></term><term><option>--no-mount</option></term>
+<!--
+ <listitem><para>No mounting; prevent <command>apt-cdrom</command> from
+ mounting and unmounting the mount point.
+ Configuration Item: <literal>APT::CDROM::NoMount</literal>.
+-->
+ <listitem><para>マウントãªã— - <command>apt-cdrom</command> ãŒã€
+ マウントãƒã‚¤ãƒ³ãƒˆã«ãƒžã‚¦ãƒ³ãƒˆãƒ»ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ãªã„よã†ã«ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::CDROM::NoMount</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--fast</option></term>
+<!--
+ <listitem><para>Fast Copy; Assume the package files are valid and do not
+ check every package. This option should be used only if
+ <command>apt-cdrom</command> has been run on this disc before and did not
+ detect any errors.
+ Configuration Item: <literal>APT::CDROM::Fast</literal>.
+-->
+ <listitem><para>高速コピー - パッケージファイルãŒå¦¥å½“ã§ã‚ã‚‹ã¨ä»®å®šã—ã€
+ ãƒã‚§ãƒƒã‚¯ã‚’å…¨ãè¡Œã„ã¾ã›ã‚“。ã“ã®ã‚ªãƒ—ションã¯ã€
+ ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã§ä»¥å‰ <command>apt-cdrom</command> ã‚’è¡Œã£ã¦ãŠã‚Šã€
+ エラーを検出ã—ãªã‹ã£ãŸå ´åˆã®ã¿ä½¿ç”¨ã™ã¹ãã§ã™ã€‚
+ 設定項目 - <literal>APT::CDROM::Fast</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-a</option></term><term><option>--thorough</option></term>
+<!--
+ <listitem><para>Thorough Package Scan; This option may be needed with some
+ old Debian 1.1/1.2 discs that have Package files in strange places. It
+ takes much longer to scan the CD but will pick them all up.
+-->
+ <listitem><para>完全パッケージスキャン -
+ å¤ã„ Debian 1.1/1.2 ã®ãƒ‡ã‚£ã‚¹ã‚¯ã¯ã€ãƒ‘ッケージファイルãŒé•ã†å ´æ‰€ã«ã‚ã‚‹ãŸã‚ã€
+ ã“ã®ã‚ªãƒ—ションを使ã†å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+ CD をスキャンã™ã‚‹ã®ã«éžå¸¸ã«æ™‚é–“ãŒã‹ã‹ã‚Šã¾ã™ãŒã€
+ 全パッケージファイルを抽出ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-n</option></term>
+ <term><option>--just-print</option></term>
+ <term><option>--recon</option></term>
+ <term><option>--no-act</option></term>
+<!--
+ <listitem><para>No Changes; Do not change the &sources-list; file and do
+ not write index files. Everything is still checked however.
+ Configuration Item: <literal>APT::CDROM::NoAct</literal>.
+-->
+ <listitem><para>変更ãªã— - &sources-list; ファイルã®å¤‰æ›´ã‚„ã€
+ インデックスファイルã®æ›¸ãè¾¼ã¿ã‚’è¡Œã„ã¾ã›ã‚“。
+ ã¨ã¯ã„ãˆã€ã™ã¹ã¦ã®ãƒã‚§ãƒƒã‚¯ã¯è¡Œã„ã¾ã™ã€‚
+ 設定項目 - <literal>APT::CDROM::NoAct</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;, &apt-get;, &sources-list;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-cdrom</command> returns zero on normal operation, decimal 100 on error.
+-->
+ <para><command>apt-cdrom</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+</refentry>
+
diff --git a/doc/ja/apt-config.ja.8.xml b/doc/ja/apt-config.ja.8.xml
new file mode 100644
index 000000000..b1d90f5b5
--- /dev/null
+++ b/doc/ja/apt-config.ja.8.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-config</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-config</refname>
+<!--
+ <refpurpose>APT Configuration Query program</refpurpose>
+-->
+ <refpurpose>APT 設定å–得プログラム</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-config</command>
+ <arg><option>-hv</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>shell</arg>
+ <arg>dump</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-config</command> is an internal program used by various
+ portions of the APT suite to provide consistent configurability. It accesses
+ the main configuration file <filename>/etc/apt/apt.conf</filename> in a
+ manner that is easy to use by scripted applications.</para>
+-->
+ <para><command>apt-config</command> ã¯ã€
+ APT スイートã®æ§˜ã€…ãªæ‰€ã§ä¸€è²«ã—ãŸè¨­å®šã‚’è¡Œã†ãŸã‚ã«ä½¿ç”¨ã™ã‚‹ã€å†…部ツールã§ã™ã€‚
+ スクリプトアプリケーションã§ä½¿ã„ã‚„ã™ã„方法ã§ã€
+ メイン設定ファイル <filename>/etc/apt/apt.conf</filename>
+ ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+ given one of the commands below must be present.
+ </para>
+-->
+ <para><option>-h</option> ã‚„ <option>--help</option> オプションを除ãã€
+ 以下ã«æŒ™ã’るコマンドãŒå¿…è¦ã§ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>shell</term>
+ <listitem><para>
+<!--
+ shell is used to access the configuration information from a shell
+ script. It is given pairs of arguments, the first being a shell
+ variable and the second the configuration value to query. As output
+ it lists a series of shell assignments commands for each present value.
+ In a shell script it should be used like:
+-->
+ shell ã¯ã€ã‚·ã‚§ãƒ«ã‚¹ã‚¯ãƒªãƒ—トã‹ã‚‰è¨­å®šæƒ…å ±ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ 引数ã¨ã—ã¦ã€ã¾ãšã‚·ã‚§ãƒ«å¤‰æ•°ã€æ¬¡ã«å–å¾—ã—ãŸã„設定値をペアã§ä¸Žãˆã¾ã™ã€‚
+ 出力ã¨ã—ã¦ã€ç¾åœ¨ã®å€¤ã”ã¨ã«ã‚·ã‚§ãƒ«ä»£å…¥ã‚³ãƒžãƒ³ãƒ‰ã®ä¸€è¦§ã‚’表示ã—ã¾ã™ã€‚
+ シェルスクリプト内ã§ã¯ã€ä»¥ä¸‹ã®ã‚ˆã†ã«ã—ã¦ãã ã•ã„。
+ </para>
+
+<informalexample><programlisting>
+OPTS="-f"
+RES=`apt-config shell OPTS MyApp::options`
+eval $RES
+</programlisting></informalexample>
+
+<!--
+ <para>This will set the shell environment variable $OPTS to the value of
+ MyApp::options with a default of <option>-f</option>.</para>
+-->
+ <para>ã“ã‚Œã¯ã€MyApp::options ã®å€¤ã‚’シェル環境変数 $OPTS ã«ã‚»ãƒƒãƒˆã—ã¾ã™ã€‚
+ デフォルト値㯠<option>-f</option> ã¨ãªã‚Šã¾ã™ã€‚</para>
+
+ <!--
+ <para>The configuration item may be postfixed with a /[fdbi]. f returns
+ file names, d returns directories, b returns true or false and i returns
+ an integer. Each of the returns is normalized and verified
+ internally.</para>
+-->
+ <para>設定項目㯠/[fdbi] を後ã‚ã«ä»˜ã‘られã¾ã™ã€‚
+ f ã¯ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ã€d ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€b 㯠true ã‹ false ã‚’ã€
+ i ã¯æ•´æ•°ã‚’è¿”ã—ã¾ã™ã€‚
+ 返り値ã”ã¨ã«å†…部ã§æ­£è¦åŒ–ã¨æ¤œè¨¼ã‚’è¡Œã„ã¾ã™ã€‚</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>dump</term>
+ <listitem><para>
+<!--
+ Just show the contents of the configuration space.</para>
+-->
+ 設定箇所ã®å†…容を表示ã™ã‚‹ã ã‘ã§ã™ã€‚</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-config</command> returns zero on normal operation, decimal 100 on error.
+-->
+ <para><command>apt-config</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-extracttemplates.ja.1.xml b/doc/ja/apt-extracttemplates.ja.1.xml
new file mode 100644
index 000000000..079c89402
--- /dev/null
+++ b/doc/ja/apt-extracttemplates.ja.1.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-extracttemplates</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-extracttemplates</refname>
+<!--
+ <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
+-->
+ <refpurpose>Debian パッケージã‹ã‚‰ DebConf 設定ã¨ãƒ†ãƒ³ãƒ—レートを抽出ã™ã‚‹ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-extracttemplates</command>
+ <arg><option>-hv</option></arg>
+ <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg>
+ <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-extracttemplates</command> will take one or more Debian package files
+ as input and write out (to a temporary directory) all associated config
+ scripts and template files. For each passed in package that contains
+ config scripts and templates, one line of output will be generated
+ in the format:</para>
+-->
+ <para><command>apt-extracttemplates</command> ã¯ã€
+ 入力ã«è¤‡æ•°ã® Debian パッケージをã¨ã‚Šã€
+ 関連ã™ã‚‹è¨­å®šã‚¹ã‚¯ãƒªãƒ—トã¨ãƒ†ãƒ³ãƒ—レートファイルを
+ (一時ディレクトリã«) 出力ã—ã¾ã™ã€‚
+ 設定スクリプト・テンプレートファイルをæŒã¤ã€
+ 渡ã•ã‚ŒãŸãƒ‘ッケージãã‚Œãžã‚Œã«å¯¾ã—ã€ä»¥ä¸‹ã®å½¢å¼ã§ 1 è¡Œãšã¤å‡ºåŠ›ã—ã¾ã™ã€‚</para>
+ <para>package version template-file config-script</para>
+<!--
+ <para>template-file and config-script are written to the temporary directory
+ specified by the -t or -\-tempdir (<literal>APT::ExtractTemplates::TempDir</literal>)
+ directory, with filenames of the form <filename>package.template.XXXX</filename> and
+ <filename>package.config.XXXX</filename></para>
+-->
+ <para>テンプレートファイルやã€è¨­å®šã‚¹ã‚¯ãƒªãƒ—トã¯ã€
+ -t ã‚„ --tempdir ã§æŒ‡å®šã—ãŸä¸€æ™‚ディレクトリ
+ (<literal>APT::ExtractTemplates::TempDir</literal>) ã«æ›¸ã出ã•ã‚Œã€
+ ファイルåã¯ã€<filename>package.template.XXXX</filename> ã‚„
+ <filename>package.config.XXXX</filename> ã¨è¨€ã£ãŸå½¢ã«ãªã‚Šã¾ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
+<!--
+ <listitem><para>
+ Temporary directory in which to write extracted debconf template files
+ and config scripts
+ Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+-->
+ <listitem><para>
+ 抽出ã—㟠debconf テンプレートファイルや設定スクリプトを書ã出ã™ã€
+ 一時ディレクトリ。
+ 設定項目 - <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+
+
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+ <para><command>apt-extracttemplates</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml
new file mode 100644
index 000000000..be6bbd767
--- /dev/null
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@ -0,0 +1,1020 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-ftparchive</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-ftparchive</refname>
+<!--
+ <refpurpose>Utility to generate index files</refpurpose>
+-->
+ <refpurpose>インデックスファイル生æˆãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-ftparchive</command>
+ <arg><option>-hvdsq</option></arg>
+ <arg><option>--md5</option></arg>
+ <arg><option>--delink</option></arg>
+ <arg><option>--readonly</option></arg>
+ <arg><option>--contents</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+ <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+ <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+ <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+ <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg>
+ <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-ftparchive</command> is the command line tool that generates the index
+ files that APT uses to access a distribution source. The index files should
+ be generated on the origin site based on the content of that site.</para>
+-->
+ <para><command>apt-ftparchive</command> ã¯ã€
+ APT ãŒå–å¾—å…ƒã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«å¿…è¦ãªã€
+ インデックスファイルを生æˆã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ„ールã§ã™ã€‚
+ インデックスファイルã¯ã€å…ƒã®ã‚µã‚¤ãƒˆã®å†…容ã«åŸºã¥ã生æˆã•ã‚Œã‚‹ã¹ãã§ã™ã€‚</para>
+
+<!--
+ <para><command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; program,
+ incorporating its entire functionality via the <literal>packages</literal> command.
+ It also contains a contents file generator, <literal>contents</literal>, and an
+ elaborate means to 'script' the generation process for a complete
+ archive.</para>
+-->
+ <para><command>apt-ftparchive</command> ã¯ã€
+ &dpkg-scanpackages; プログラムã®ã‚¹ãƒ¼ãƒ‘ーセットã§ã€
+ <literal>packages</literal> コマンド経由ã§æ©Ÿèƒ½å…¨ä½“ã‚’å–り込んã§ã„ã¾ã™ã€‚
+ ã¾ãŸã€contents ファイルジェãƒãƒ¬ãƒ¼ã‚¿ <literal>contents</literal> ã¨
+ 完全ãªã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ç”Ÿæˆãƒ—ロセス「スクリプトã€ã§ã‚る綿密ãªæ‰‹æ®µã‚’å«ã‚“ã§ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>Internally <command>apt-ftparchive</command> can make use of binary databases to
+ cache the contents of a .deb file and it does not rely on any external
+ programs aside from &gzip;. When doing a full generate it automatically
+ performs file-change checks and builds the desired compressed output files.</para>
+-->
+ <para>本質的㫠<command>apt-ftparchive</command> ã¯ã€
+ .deb ファイルã®å†…容をキャッシュã™ã‚‹ã®ã«ãƒã‚¤ãƒŠãƒªãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’使用ã§ãã¾ã™ã€‚
+ ã¾ãŸã€&gzip; 以外ã®ã„ã‹ãªã‚‹å¤–部プログラムã«ã‚‚ä¾å­˜ã—ã¾ã›ã‚“。
+ ã™ã¹ã¦ç”Ÿæˆã™ã‚‹éš›ã«ã¯ã€
+ ファイル変更点ã®æ¤œå‡ºã¨å¸Œæœ›ã—ãŸåœ§ç¸®å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½œæˆã‚’自動的ã«å®Ÿè¡Œã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除ãã€
+ 以下ã«æŒ™ã’るコマンドãŒå¿…è¦ã§ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>packages</term>
+ <listitem><para>
+<!--
+ The packages command generates a package file from a directory tree. It
+ takes the given directory and recursively searches it for .deb files,
+ emitting a package record to stdout for each. This command is
+ approximately equivalent to &dpkg-scanpackages;.</para>
+-->
+ packages コマンドã¯ã€
+ ディレクトリツリーã‹ã‚‰ãƒ‘ッケージファイルを生æˆã—ã¾ã™ã€‚
+ 与ãˆã‚‰ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰å†å¸°æ¤œç´¢ã—ã€.deb ファイルをå–å¾—ã—ã¾ã™ã€‚
+ ã¾ãŸãƒ‘ッケージレコードを標準出力ã«ãã‚Œãžã‚Œå‡ºåŠ›ã—ã¾ã™ã€‚
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€&dpkg-scanpackages; ã¨ã»ã¼åŒã˜ã§ã™ã€‚</para>
+
+<!--
+ <para>The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+ <para><option>--db</option> オプションã§ã€
+ キャッシュ DB を指定ã§ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>sources</term>
+ <listitem><para>
+<!--
+ The <literal>sources</literal> command generates a source index file from a directory tree.
+ It takes the given directory and recursively searches it for .dsc files,
+ emitting a source record to stdout for each. This command is approximately
+ equivalent to &dpkg-scansources;.</para>
+-->
+ <literal>sources</literal> コマンドã¯ã€
+ ディレクトリツリーã‹ã‚‰ã‚½ãƒ¼ã‚¹ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾ã™ã€‚
+ 与ãˆã‚‰ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰å†å¸°æ¤œç´¢ã—ã€.dsc ファイルをå–å¾—ã—ã¾ã™ã€‚
+ ã¾ãŸã‚½ãƒ¼ã‚¹ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’標準出力ã«ãã‚Œãžã‚Œå‡ºåŠ›ã—ã¾ã™ã€‚
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€&dpkg-scansources; ã¨ã»ã¼åŒã˜ã§ã™ã€‚</para>
+ <para>
+<!--
+ If an override file is specified then a source override file will be
+ looked for with an extension of .src. The -\-source-override option can be
+ used to change the source override file that will be used.</para></listitem>
+-->
+ override ファイルを指定ã—ãŸå ´åˆã€
+ src æ‹¡å¼µå­ãŒã¤ã„ãŸã‚½ãƒ¼ã‚¹ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’探ã—ã¾ã™ã€‚
+ 使用ã™ã‚‹ã‚½ãƒ¼ã‚¹ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’変更ã™ã‚‹ã®ã«ã¯ã€
+ --source-override オプションを使用ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>contents</term>
+ <listitem><para>
+<!--
+ The <literal>contents</literal> command generates a contents file from a directory tree. It
+ takes the given directory and recursively searches it for .deb files,
+ and reads the file list from each file. It then sorts and writes to stdout
+ the list of files matched to packages. Directories are not written to
+ the output. If multiple packages own the same file then each package is
+ separated by a comma in the output.</para>
+-->
+ <literal>contents</literal> コマンドã¯ã€
+ ディレクトリツリーã‹ã‚‰ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ファイルを生æˆã—ã¾ã™ã€‚
+ 与ãˆã‚‰ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰å†å¸°æ¤œç´¢ã—ã€.deb ファイルをå–å¾—ã—ã¾ã™ã€‚
+ ã¾ãŸãƒ•ã‚¡ã‚¤ãƒ«ã”ã¨ã«ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’読ã¿å–ã‚Šã¾ã™ã€‚
+ ãã®å¾Œã€ãƒ‘ッケージã«å¯¾å¿œã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’標準出力ã«ã‚½ãƒ¼ãƒˆã—ã¦å‡ºåŠ›ã—ã¾ã™ã€‚
+ ディレクトリã¯å‡ºåŠ›ã«å«ã¾ã‚Œã¾ã›ã‚“。
+ 複数ã®ãƒ‘ッケージãŒåŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒã¤å ´åˆã€
+ パッケージåをカンマ区切りã§å‡ºåŠ›ã—ã¾ã™ã€‚</para>
+ <para>
+<!--
+ The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+ <option>--db</option> オプションã§ã€
+ キャッシュ DB を指定ã§ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>release</term>
+ <listitem><para>
+<!--
+ The <literal>release</literal> command generates a Release file from a
+ directory tree. It recursively searches the given directory for
+ Packages, Packages.gz, Packages.bz2, Sources, Sources.gz,
+ Sources.bz2, Release and md5sum.txt files. It then writes to
+ stdout a Release file containing an MD5 digest and SHA1 digest
+ for each file.</para>
+-->
+ <literal>release</literal> コマンドã¯ã€
+ ディレクトリツリーã‹ã‚‰ Release ファイルを生æˆã—ã¾ã™ã€‚
+ 与ãˆã‚‰ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ã€Packages, Packages.gz, Packages.bz2, Sources,
+ Sources.gz, Sources.bz2, Release, md5sum.txt
+ ã¨ã„ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å†å¸°æ¤œç´¢ã—ã¾ã™ã€‚
+ ãã®å¾Œã€ãƒ•ã‚¡ã‚¤ãƒ«ã”ã¨ã® MD5 ダイジェスト㨠SHA1 ダイジェストをå«ã‚“ã 
+ Release ファイルをã€æ¨™æº–出力ã«æ›¸ã出ã—ã¾ã™ã€‚</para>
+ <para>
+<!--
+ Values for the additional metadata fields in the Release file are
+ taken from the corresponding variables under
+ <literal>APT::FTPArchive::Release</literal>,
+ e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported fields
+ are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+ <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+ <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>.</para></listitem>
+-->
+ Release ファイルã®è¿½åŠ ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®å€¤ã¯ã€
+ <literal>APT::FTPArchive::Release</literal> 以下ã®ç›¸å½“ã™ã‚‹å€¤
+ (例: <literal>APT::FTPArchive::Release::Origin</literal>) ã‚’ã¨ã‚Šã¾ã™ã€‚
+ サãƒãƒ¼ãƒˆã™ã‚‹ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã€
+ <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+ <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+ <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal> ã§ã™ã€‚</para></listitem>
+
+ </varlistentry>
+
+ <varlistentry><term>generate</term>
+ <listitem><para>
+<!--
+ The <literal>generate</literal> command is designed to be runnable from a cron script and
+ builds indexes according to the given config file. The config language
+ provides a flexible means of specifying which index files are built from
+ which directories, as well as providing a simple means of maintaining the
+ required settings.</para></listitem>
+-->
+ <literal>generate</literal> コマンドã¯ã€
+ cron スクリプトã‹ã‚‰å®Ÿè¡Œã§ãるよã†è¨­è¨ˆã•ã‚Œã¦ãŠã‚Šã€
+ 与ãˆã‚‰ã‚ŒãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã«å¾“ã£ã¦ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’生æˆã—ã¾ã™ã€‚
+ 設定言語ã¯ã€å¿…è¦ãªè¨­å®šã‚’維æŒã™ã‚‹ç°¡å˜ãªæ–¹æ³•ã‚’æä¾›ã™ã‚‹ã¨å…±ã«ã€
+ インデックスファイルをã©ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ä½œæˆã™ã‚‹ã‹ã‚’指定ã™ã‚‹ã€
+ 柔軟ãªæ–¹æ³•ã‚’æä¾›ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>clean</term>
+ <listitem><para>
+<!--
+ The <literal>clean</literal> command tidies the databases used by the given
+ configuration file by removing any records that are no longer necessary.</para></listitem>
+-->
+ <literal>clean</literal> コマンドã¯ã€
+ 設定ファイルã§ä¸Žãˆã‚‰ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ã€
+ ã‚‚ã†å¿…è¦ãªã„レコードを削除ã—ã¦æ•´ç†ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Generate Configuration</title>
+-->
+ <refsect1><title>generate 設定</title>
+ <para>
+<!--
+ The <literal>generate</literal> command uses a configuration file to describe the
+ archives that are going to be generated. It follows the typical ISC
+ configuration format as seen in ISC tools like bind 8 and dhcpd.
+ &apt-conf; contains a description of the syntax. Note that the generate
+ configuration is parsed in sectional manner, but &apt-conf; is parsed in a
+ tree manner. This only effects how the scope tag is handled.</para>
+-->
+ <literal>generate</literal> コマンドã¯ã€
+ 生æˆã™ã‚‹ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã«é–¢ã™ã‚‹è¨˜è¿°ã‚’ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—ã¾ã™ã€‚
+ 設定ファイルã¯ã€bind 8 ã‚„ dhcpd ã¨ã„ã£ãŸ ISC ツールã«è¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ãªã€
+ ISC 設定フォーマットã«å¾“ã„ã¾ã™ã€‚
+ &apt-conf; ã«ã€æ–‡æ³•ã®èª¬æ˜ŽãŒã‚ã‚Šã¾ã™ã€‚
+ generate 設定ã¯ã‚»ã‚¯ã‚·ãƒ§ãƒ³æ³•ã§è§£æžã—ã¾ã™ãŒã€
+ &apt-conf; ã¯ãƒ„リー法ã§è§£æžã™ã‚‹ã®ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ ã“ã‚Œã¯ã‚¹ã‚³ãƒ¼ãƒ—ã‚¿ã‚°ã®æ‰±ã„æ–¹ã«é•ã„ãŒã‚ã‚‹ã ã‘ã§ã™ã€‚</para>
+
+ <para>
+<!--
+ The generate configuration has 4 separate sections, each described below.</para>
+-->
+ generate 設定ã«ã¯ 4 個ã®ç‹¬ç«‹ã—ãŸã‚»ã‚¯ã‚·ãƒ§ãƒ³ãŒã‚ã‚Šã¾ã™ã€‚
+ 以下ãã‚Œãžã‚Œèª¬æ˜Žã—ã¾ã™ã€‚</para>
+
+<!--
+ <refsect2><title>Dir Section</title>
+-->
+ <refsect2><title>Dir セクション</title>
+ <para>
+<!--
+ The <literal>Dir</literal> section defines the standard directories needed to
+ locate the files required during the generation process. These
+ directories are prepended to certain relative paths defined in later
+ sections to produce a complete an absolute path.</para>
+-->
+ <literal>Dir</literal> セクションã¯ã€
+ 生æˆãƒ—ロセスã§å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’é…ç½®ã™ã‚‹ãŸã‚ã®ã€
+ 標準ディレクトリを定義ã—ã¾ã™ã€‚
+ ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã€å®Œå…¨ãªçµ¶å¯¾ãƒ‘スを生æˆã™ã‚‹ãŸã‚ã€
+ 後ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§å®šç¾©ã•ã‚Œã‚‹ç›¸å¯¾ãƒ‘スã®å‰ã«çµåˆã—ã¾ã™ã€‚</para>
+ <variablelist>
+ <varlistentry><term>ArchiveDir</term>
+ <listitem><para>
+<!--
+ Specifies the root of the FTP archive, in a standard
+ Debian configuration this is the directory that contains the
+ <filename>ls-LR</filename> and dist nodes.</para></listitem>
+-->
+ FTP アーカイブã®ãƒ«ãƒ¼ãƒˆã‚’指定ã—ã¾ã™ã€‚
+ 標準的㪠Debian 設定ã§ã¯ã€ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã¯
+ <filename>ls-LR</filename> 㨠dist ノードãŒã‚ã‚Šã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>OverrideDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the override files.</para></listitem>
+-->
+ オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã®å ´æ‰€ã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>CacheDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the cache files</para></listitem>
+-->
+ キャッシュファイルã®å ´æ‰€ã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileListDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the file list files,
+ if the <literal>FileList</literal> setting is used below.</para></listitem>
+-->
+ <literal>FileList</literal> 設定ãŒä»¥ä¸‹ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹å ´åˆã€
+ ファイルリストファイルã®å ´æ‰€ã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>Default Section</title>
+-->
+ <refsect2><title>Default セクション</title>
+ <para>
+<!--
+ The <literal>Default</literal> section specifies default values, and settings
+ that control the operation of the generator. Other sections may override
+ these defaults with a per-section setting.</para>
+-->
+ <literal>Default</literal> セクションã§ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’指定ã—ã¾ã™ã€‚
+ ã¾ãŸã€ç”Ÿæˆå™¨ã®å‹•ä½œã‚’制御ã™ã‚‹è¨­å®šã‚‚è¡Œã„ã¾ã™ã€‚
+ ä»–ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§ã¯ã€ã“ã“ã«ã‚るデフォルト値をã€
+ セクションã”ã¨ã®è¨­å®šã§ä¸Šæ›¸ãã—ã¾ã™ã€‚</para>
+ <variablelist>
+ <varlistentry><term>Packages::Compress</term>
+ <listitem><para>
+<!--
+ Sets the default compression schemes to use
+ for the Package index files. It is a string that contains a space
+ separated list of at least one of: '.' (no compression), 'gzip' and
+ 'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem>
+-->
+ Package インデックスファイルã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®åœ§ç¸®æ–¹æ³•ã‚’設定ã—ã¾ã™ã€‚
+ å°‘ãªãã¨ã‚‚ã²ã¨ã¤ã¯ '.' (圧縮ãªã—), 'gzip', 'bzip2' ãŒå…¥ã‚‹ã€
+ 空白区切りã®æ–‡å­—列ã§ã™ã€‚
+ 圧縮方法ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ã™ã¹ã¦ '. gzip' ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Packages::Extensions</term>
+ <listitem><para>
+<!--
+ Sets the default list of file extensions that are package files.
+ This defaults to '.deb'.</para></listitem>
+-->
+ パッケージファイル拡張å­ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’列挙ã—ã¾ã™ã€‚
+ ã“ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã¯ '.deb' ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources::Compress</term>
+ <listitem><para>
+<!--
+ This is similar to <literal>Packages::Compress</literal>
+ except that it controls the compression for the Sources files.</para></listitem>
+-->
+ <literal>Packages::Compress</literal> ã¨åŒæ§˜ã«ã€
+ Sources ファイルã®åœ§ç¸®æ–¹æ³•ã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources::Extensions</term>
+ <listitem><para>
+<!--
+ Sets the default list of file extensions that are source files.
+ This defaults to '.dsc'.</para></listitem>
+-->
+ ソースファイル拡張å­ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’列挙ã—ã¾ã™ã€‚
+ ã“ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã¯ '.dsc' ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents::Compress</term>
+ <listitem><para>
+<!--
+ This is similar to <literal>Packages::Compress</literal>
+ except that it controls the compression for the Contents files.</para></listitem>
+-->
+ <literal>Packages::Compress</literal> ã¨åŒæ§˜ã«ã€
+ Contents ファイルã®åœ§ç¸®æ–¹æ³•ã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>DeLinkLimit</term>
+ <listitem><para>
+<!--
+ Specifies the number of kilobytes to delink (and
+ replace with hard links) per run. This is used in conjunction with the
+ per-section <literal>External-Links</literal> setting.</para></listitem>
+-->
+ 実行ã™ã‚‹ã”ã¨ã« delink (åŠã³ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã®ç½®ãæ›ãˆ) ã™ã‚‹é‡ã‚’ã€
+ キロãƒã‚¤ãƒˆå˜ä½ã§æŒ‡å®šã—ã¾ã™ã€‚セクションã”ã¨ã®
+ <literal>External-Links</literal> 設定ã¨åˆã‚ã›ã¦ä½¿ã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileMode</term>
+ <listitem><para>
+<!--
+ Specifies the mode of all created index files. It
+ defaults to 0644. All index files are set to this mode with no regard
+ to the umask.</para></listitem>
+-->
+ 作æˆã—ãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ¢ãƒ¼ãƒ‰ã‚’指定ã—ã¾ã™ã€‚
+ デフォルト㯠0644 ã§ã™ã€‚全インデックスファイルã¯ã€
+ umask を無視ã—ã¦ã“ã®ãƒ¢ãƒ¼ãƒ‰ã‚’使用ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>TreeDefault Section</title>
+-->
+ <refsect2><title>TreeDefault セクション</title>
+ <para>
+<!--
+ Sets defaults specific to <literal>Tree</literal> sections. All of these
+ variables are substitution variables and have the strings $(DIST),
+ $(SECTION) and $(ARCH) replaced with their respective values.</para>
+-->
+ 特定㮠<literal>Tree</literal> セクションã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’設定ã—ã¾ã™ã€‚
+ ã“れらã®å¤‰æ•°ã¯ã™ã¹ã¦ç½®æ›å¤‰æ•°ã§ã‚ã‚Šã€
+ 文字列 $(DIST), $(SECTION), $(ARCH) ã‚’ãã‚Œãžã‚Œã®å€¤ã«å±•é–‹ã—ã¾ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>MaxContentsChange</term>
+ <listitem><para>
+<!--
+ Sets the number of kilobytes of contents
+ files that are generated each day. The contents files are round-robined
+ so that over several days they will all be rebuilt.</para></listitem>
+-->
+ 日毎ã«ç”Ÿæˆã™ã‚‹ contents ファイルをキロãƒã‚¤ãƒˆå˜ä½ã§è¨­å®šã—ã¾ã™ã€‚
+ contents ファイルをラウンドロビンã—ã€æ•°æ—¥çµŒã¤ã¨ã™ã¹ã¦å†ç”Ÿæˆã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ContentsAge</term>
+ <listitem><para>
+<!--
+ Controls the number of days a contents file is allowed
+ to be checked without changing. If this limit is passed the mtime of the
+ contents file is updated. This case can occur if the package file is
+ changed in such a way that does not result in a new contents file
+ [override edit for instance]. A hold off is allowed in hopes that new
+ .debs will be installed, requiring a new file anyhow. The default is 10,
+ the units are in days.</para></listitem>
+-->
+ 変更ãŒãªã„ contents ファイルをãƒã‚§ãƒƒã‚¯ã™ã‚‹æ—¥æ•°ã‚’指定ã—ã¾ã™ã€‚
+ ã“ã®åˆ¶é™ã‚’越ãˆãŸ contents ファイル㮠mtime ã‚’ã€æ›´æ–°ã—ã¾ã™ã€‚
+ パッケージファイルãŒå¤‰æ›´ã•ã‚Œã¦ã‚‚ã€
+ [例ãˆã°ä¸Šæ›¸ã編集ã§] contents ファイルãŒæ›´æ–°ã•ã‚Œãªã„よã†ãªå ´åˆã€
+ ã“ã†ã„ã£ãŸã“ã¨ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ æ–°ã—ã„ .deb ファイルをインストールã—ãŸã„å ´åˆã€ä¿ç•™ã‚’解除ã§ãã€
+ å°‘ãªãã¨ã‚‚æ–°ã—ã„ファイルãŒå¿…è¦ã§ã™ã€‚
+ デフォルト㯠10 ã§ã€å˜ä½ã¯æ—¥ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Directory</term>
+ <listitem><para>
+<!--
+ Sets the top of the .deb directory tree. Defaults to
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem>
+-->
+ .deb ディレクトリツリーã®å…ˆé ­ã‚’設定ã—ã¾ã™ã€‚デフォルトã¯
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcDirectory</term>
+ <listitem><para>
+<!--
+ Sets the top of the source package directory tree. Defaults to
+ <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem>
+-->
+ ソースパッケージディレクトリツリーã®å…ˆé ­ã‚’設定ã—ã¾ã™ã€‚デフォルトã¯
+ <filename>$(DIST)/$(SECTION)/source/</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Packages</term>
+ <listitem><para>
+<!--
+ Sets the output Packages file. Defaults to
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem>
+-->
+ Packages ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚デフォルトã¯
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources</term>
+ <listitem><para>
+<!--
+ Sets the output Packages file. Defaults to
+ <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
+-->
+ Packages ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚デフォルトã¯
+ <filename>$(DIST)/$(SECTION)/source/Sources</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>InternalPrefix</term>
+ <listitem><para>
+<!--
+ Sets the path prefix that causes a symlink to be
+ considered an internal link instead of an external link. Defaults to
+ <filename>$(DIST)/$(SECTION)/</filename></para></listitem>
+-->
+ 外部リンクã§ã¯ãªãã€å†…部リンクã¨è¦‹ãªã™åˆ¤æ–­ææ–™ã¨ãªã‚‹ã€
+ パスã®ãƒ—レフィックスを設定ã—ã¾ã™ã€‚デフォルトã¯ã€
+ <filename>$(DIST)/$(SECTION)/</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents</term>
+ <listitem><para>
+<!--
+ Sets the output Contents file. Defaults to
+ <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple
+ Packages files to map onto a single Contents file (such as the default)
+ then <command>apt-ftparchive</command> will integrate those package files
+ together automatically.</para></listitem>
+-->
+ Contents ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚デフォルトã¯ã€
+ <filename>$(DIST)/Contents-$(ARCH)</filename> ã§ã™ã€‚
+ 複数㮠Packages ファイルを ã²ã¨ã¤ã® Contents ファイルã«ã¾ã¨ã‚られる設定
+ (デフォルト) ã®å ´åˆã€<command>apt-ftparchive</command>
+ ã¯è‡ªå‹•ã§ãƒ‘ッケージファイルをã¾ã¨ã‚ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents::Header</term>
+ <listitem><para>
+<!--
+ Sets header file to prepend to the contents output.</para></listitem>
+-->
+ contents ã®å‡ºåŠ›ã«ä»˜ã‘るヘッダファイルを設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinCacheDB</term>
+ <listitem><para>
+<!--
+ Sets the binary cache database to use for this
+ section. Multiple sections can share the same database.</para></listitem>
+-->
+ ã“ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§ä½¿ç”¨ã™ã‚‹ãƒã‚¤ãƒŠãƒªã‚­ãƒ£ãƒƒã‚·ãƒ¥ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’設定ã—ã¾ã™ã€‚
+ 複数ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§åŒã˜ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’共有ã§ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileList</term>
+ <listitem><para>
+<!--
+ Specifies that instead of walking the directory tree,
+ <command>apt-ftparchive</command> should read the list of files from the given
+ file. Relative files names are prefixed with the archive directory.</para></listitem>
+-->
+ ディレクトリツリーを走査ã™ã‚‹ä»£ã‚ã‚Šã«ã€<command>apt-ftparchive</command>
+ ãŒèª­ã¿è¾¼ã‚€ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¾ã™ã€‚
+ 相対ファイルåã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ディレクトリãŒå…ˆé ­ã«ã¤ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SourceFileList</term>
+ <listitem><para>
+<!--
+ Specifies that instead of walking the directory tree,
+ <command>apt-ftparchive</command> should read the list of files from the given
+ file. Relative files names are prefixed with the archive directory.
+ This is used when processing source indexs.</para></listitem>
+-->
+ ディレクトリツリーを走査ã™ã‚‹ä»£ã‚ã‚Šã«ã€<command>apt-ftparchive</command>
+ ãŒèª­ã¿è¾¼ã‚€ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¾ã™ã€‚
+ 相対ファイルåã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ディレクトリãŒå…ˆé ­ã«ã¤ãã¾ã™ã€‚
+ ソースインデックスを処ç†ã™ã‚‹éš›ã«ä½¿ç”¨ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>Tree Section</title>
+-->
+ <refsect2><title>Tree セクション</title>
+ <para>
+<!--
+ The <literal>Tree</literal> section defines a standard Debian file tree which
+ consists of a base directory, then multiple sections in that base
+ directory and finally multiple Architectures in each section. The exact
+ pathing used is defined by the <literal>Directory</literal> substitution variable.</para>
+-->
+ <literal>Tree</literal> セクションã§ã¯ã€
+ ベースディレクトリã‹ã‚‰ã®æ¨™æº– Debian ファイルツリーã€
+ ベースディレクトリã®è¤‡æ•°ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã€
+ 最終的ã«ã¯ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã”ã¨ã®è¤‡æ•°ã®ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã‚’定義ã—ã¾ã™ã€‚
+ 使用ã™ã‚‹æ­£ç¢ºãªãƒ‘スã¯ã€<literal>Directory</literal> 変数ã§å®šç¾©ã•ã‚Œã¾ã™ã€‚</para>
+ <para>
+<!--
+ The <literal>Tree</literal> section takes a scope tag which sets the
+ <literal>$(DIST)</literal> variable and defines the root of the tree
+ (the path is prefixed by <literal>ArchiveDir</literal>).
+ Typically this is a setting such as <filename>dists/woody</filename>.</para>
+-->
+ <literal>Tree</literal> セクションã¯ã€
+ <literal>$(DIST)</literal> 変数ã§è¨­å®šã•ã‚Œã¦ã„るスコープタグをã¨ã‚Šã€
+ ツリーã®ãƒ«ãƒ¼ãƒˆ (<literal>ArchiveDir</literal>ãŒå…ˆé ­ã«ã¤ãパス)
+ を定義ã—ã¾ã™ã€‚
+ 通常ã€ã“ã®è¨­å®šã¯ <filename>dists/woody</filename> ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚</para>
+ <para>
+<!--
+ All of the settings defined in the <literal>TreeDefault</literal> section can be
+ use in a <literal>Tree</literal> section as well as three new variables.</para>
+-->
+ <literal>TreeDefault</literal> セクションã§å®šç¾©ã•ã‚Œã‚‹è¨­å®šã¯ã™ã¹ã¦ã€
+ 3 個ã®æ–°ã—ã„変数ã¨åŒæ§˜ã«ã€
+ <literal>Tree</literal> セクションã§ä½¿ç”¨ã§ãã¾ã™ã€‚</para>
+ <para>
+<!--
+ When processing a <literal>Tree</literal> section <command>apt-ftparchive</command>
+ performs an operation similar to:
+-->
+ <literal>Tree</literal> セクションを処ç†ã™ã‚‹éš›ã€
+ <command>apt-ftparchive</command> ã¯ä»¥ä¸‹ã®ã‚ˆã†ãªæ“作を行ã„ã¾ã™ã€‚
+<informalexample><programlisting>
+for i in Sections do
+ for j in Architectures do
+ Generate for DIST=scope SECTION=i ARCH=j
+</programlisting></informalexample></para>
+
+ <variablelist>
+ <varlistentry><term>Sections</term>
+ <listitem><para>
+<!--
+ This is a space separated list of sections which appear
+ under the distribution, typically this is something like
+ <literal>main contrib non-free</literal></para></listitem>
+-->
+ distribution 以下ã«ç¾ã‚Œã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’ã€ç©ºç™½åŒºåˆ‡ã‚Šã§æŒ‡å®šã—ãŸãƒªã‚¹ãƒˆã§ã™ã€‚
+ 通常ã€<literal>main contrib non-free</literal>ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Architectures</term>
+ <listitem><para>
+<!--
+ This is a space separated list of all the
+ architectures that appear under search section. The special architecture
+ 'source' is used to indicate that this tree has a source archive.</para></listitem>
+-->
+ search セクション以下ã«ç¾ã‚Œã‚‹ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã‚’ã€
+ 空白区切りã§æŒ‡å®šã—ãŸãƒªã‚¹ãƒˆã§ã™ã€‚
+ 特殊アーキテクãƒãƒ£ 'source' ã¯ã€
+ ソースアーカイブã®ãƒ„リーã§ã‚ã‚‹ã“ã¨ã‚’示ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary override file. The override file
+ contains section, priority and maintainer address information.</para></listitem>
+-->
+ ãƒã‚¤ãƒŠãƒªã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã€å„ªå…ˆåº¦ã€
+ メンテナã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ã„ã£ãŸæƒ…å ±ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcOverride</term>
+ <listitem><para>
+<!--
+ Sets the source override file. The override file
+ contains section information.</para></listitem>
+-->
+ ソースオーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€
+ セクションã®æƒ…å ±ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary extra override file.</para></listitem>
+-->
+ ãƒã‚¤ãƒŠãƒªç‰¹åˆ¥ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the source extra override file.</para></listitem>
+-->
+ ソース特別オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>BinDirectory Section</title>
+-->
+ <refsect2><title>BinDirectory セクション</title>
+ <para>
+<!--
+ The <literal>bindirectory</literal> section defines a binary directory tree
+ with no special structure. The scope tag specifies the location of
+ the binary directory and the settings are similar to the <literal>Tree</literal>
+ section with no substitution variables or
+ <literal>Section</literal><literal>Architecture</literal> settings.</para>
+-->
+ <literal>bindirectory</literal> セクションã§ã¯ã€
+ 特殊ãªæ§‹é€ ã‚’æŒãŸãªã„ãƒã‚¤ãƒŠãƒªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ„リーを定義ã—ã¾ã™ã€‚
+ スコープタグã¯ãƒã‚¤ãƒŠãƒªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å ´æ‰€ã‚’指定ã—ã€
+ 設定ã¯ã€å¤‰æ•°å±•é–‹ã®ãªã„ <literal>Tree</literal> セクションや
+ <literal>Section</literal><literal>Architecture</literal> 設定ã«ä¼¼ã¦ã„ã¾ã™ã€‚</para>
+ <variablelist>
+ <varlistentry><term>Packages</term>
+ <listitem><para>
+<!--
+ Sets the Packages file output.</para></listitem>
+-->
+ Packages ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcPackages</term>
+ <listitem><para>
+<!--
+ Sets the Sources file output. At least one of
+ <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+-->
+ Sources ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚
+ å°‘ãªãã¨ã‚‚ <literal>Packages</literal> ã‚„ <literal>SrcPackages</literal>
+ ã¯è¨­å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents</term>
+ <listitem><para>
+<!--
+ Sets the Contents file output. (optional)</para></listitem>
+-->
+ Contents ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚(オプション)</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary override file.</para></listitem>
+-->
+ ãƒã‚¤ãƒŠãƒªã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcOverride</term>
+ <listitem><para>
+<!--
+ Sets the source override file.</para></listitem>
+-->
+ ソースオーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary extra override file.</para></listitem>
+-->
+ ãƒã‚¤ãƒŠãƒªç‰¹åˆ¥ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the source extra override file.</para></listitem>
+-->
+ ソース特別オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinCacheDB</term>
+ <listitem><para>
+<!--
+ Sets the cache DB.</para></listitem>
+-->
+ キャッシュ DB を設定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>PathPrefix</term>
+ <listitem><para>
+<!--
+ Appends a path to all the output paths.</para></listitem>
+-->
+ 全出力パスã«ä»˜åŠ ã™ã‚‹ãƒ‘ス。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileList, SourceFileList</term>
+ <listitem><para>
+<!--
+ Specifies the file list file.</para></listitem>
+-->
+ ファイル一覧ファイルを指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+ </refsect1>
+
+
+<!--
+ <refsect1><title>The Binary Override File</title>
+-->
+ <refsect1><title>ãƒã‚¤ãƒŠãƒªã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«</title>
+<!--
+ <para>The binary override file is fully compatible with &dpkg-scanpackages;. It
+ contains 4 fields separated by spaces. The first field is the package name,
+ the second is the priority to force that package to, the third is the
+ the section to force that package to and the final field is the maintainer
+ permutation field.</para>
+-->
+ <para>ãƒã‚¤ãƒŠãƒªã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€
+ &dpkg-scanpackages; ã¨å®Œå…¨ã«äº’æ›æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ ã“ã“ã«ã¯ã€ç©ºç™½åŒºåˆ‡ã‚Šã§ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒ 4 個ã‚ã‚Šã¾ã™ã€‚
+ 先頭ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ãƒ‘ッケージåã€
+ 2 番目ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ãƒ‘ッケージã«å¼·åˆ¶ã™ã‚‹å„ªå…ˆåº¦ã€
+ 3 番目ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ãƒ‘ッケージã«å¼·åˆ¶ã™ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã€
+ 最後ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ãƒ¡ãƒ³ãƒ†ãƒŠé †åˆ—フィールドã§ã™ã€‚</para>
+<!--
+ <para>The general form of the maintainer field is:
+ <literallayout>old [// oldn]* => new</literallayout>
+ or simply,
+ <literallayout>new</literallayout>
+ The first form allows a double-slash separated list of old email addresses
+ to be specified. If any of those are found then new is substituted for the
+ maintainer field. The second form unconditionally substitutes the
+ maintainer field.</para>
+-->
+ <para>メンテナフィールドã¯ä¸€èˆ¬çš„ã«ã¯ã€
+ <literallayout>old [// oldn]* => new</literallayout>
+ ã¨ã„ã†å½¢å¼ã‹ã€å˜ç´”ã«
+ <literallayout>new</literallayout>
+ ã¨ãªã‚Šã¾ã™ã€‚
+ 最åˆã®å½¢å¼ã¯ã€// ã§åŒºåˆ‡ã‚‰ã‚ŒãŸå¤ã„ email アドレスã®ãƒªã‚¹ãƒˆã‚’許å¯ã—ã¾ã™ã€‚
+ ã“ã®å½¢å¼ãŒã‚ã‚‹å ´åˆã¯ã€ãƒ¡ãƒ³ãƒ†ãƒŠãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãªã‚‹ã‚ˆã† new ã«ç½®æ›ã—ã¦ãã ã•ã„。
+ 2 番目ã®å½¢å¼ã¯ç„¡æ¡ä»¶ã«ãƒ¡ãƒ³ãƒ†ãƒŠãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ç½®æ›ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+
+<!--
+ <refsect1><title>The Source Override File</title>
+-->
+ <refsect1><title>ソースオーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«</title>
+ <para>
+<!--
+ The source override file is fully compatible with &dpkg-scansources;. It
+ contains 2 fields separated by spaces. The first fields is the source
+ package name, the second is the section to assign it.</para>
+-->
+ ソースオーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€
+ &dpkg-scansources; ã¨å®Œå…¨ã«äº’æ›æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ ã“ã“ã«ã¯ã€ç©ºç™½åŒºåˆ‡ã‚Šã§ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒ 2 個ã‚ã‚Šã¾ã™ã€‚
+ 先頭ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã‚½ãƒ¼ã‚¹ãƒ‘ッケージåã€
+ 2 番目ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯å‰²ã‚Šå½“ã¦ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Extra Override File</title>
+-->
+ <refsect1><title>特別オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«</title>
+ <para>
+<!--
+ The extra override file allows any arbitrary tag to be added or replaced
+ in the output. It has 3 columns, the first is the package, the second is
+ the tag and the remainder of the line is the new value.</para>
+-->
+ 特別オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€
+ 出力中ã«ä»»æ„ã®ã‚¿ã‚°ã‚’追加・置æ›ã§ãるよã†ã«ã—ã¾ã™ã€‚
+ 3 列ã‹ã‚‰ãªã‚Šã€å…ˆé ­ã¯ãƒ‘ッケージã€2番目ã¯ã‚¿ã‚°ã€æ®‹ã‚Šã¯æ–°ã—ã„値ã§ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>--md5</option></term>
+ <listitem><para>
+<!--
+ Generate MD5 sums. This defaults to on, when turned off the generated
+ index files will not have MD5Sum fields where possible.
+ Configuration Item: <literal>APT::FTPArchive::MD5</literal></para></listitem>
+-->
+ MD5 sum を生æˆã—ã¾ã™ã€‚デフォルト㧠on ã«ãªã£ã¦ãŠã‚Šã€
+ off ã«ã™ã‚‹ã¨ç”Ÿæˆã—ãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã« MD5Sum フィールドãŒã‚ã‚Šã¾ã›ã‚“。
+ 設定項目 - <literal>APT::FTPArchive::MD5</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-d</option></term><term><option>--db</option></term>
+ <listitem><para>
+<!--
+ Use a binary caching DB. This has no effect on the generate command.
+ Configuration Item: <literal>APT::FTPArchive::DB</literal>.</para></listitem>
+-->
+ ãƒã‚¤ãƒŠãƒªã‚­ãƒ£ãƒƒã‚·ãƒ¥ DB を使用ã—ã¾ã™ã€‚
+ generate コマンドã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。
+ 設定項目 - <literal>APT::FTPArchive::DB</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+ <listitem><para>
+<!--
+ Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quiet up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quiet level, overriding the configuration file.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ é™ç²› - 進æ—表示をçœç•¥ã—ã€ãƒ­ã‚°ã‚’ã¨ã‚‹ã®ã«ä¾¿åˆ©ãªå‡ºåŠ›ã‚’è¡Œã„ã¾ã™ã€‚
+ 最大 2 ã¤ã¾ã§ q ã‚’é‡ã­ã‚‹ã“ã¨ã§ã‚ˆã‚Šé™ç²›ã«ã§ãã¾ã™ã€‚
+ ã¾ãŸã€<option>-q=#</option> ã®ã‚ˆã†ã«é™ç²›ãƒ¬ãƒ™ãƒ«ã‚’指定ã—ã¦ã€
+ 設定ファイルを上書ãã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--delink</option></term>
+ <listitem><para>
+<!--
+ Perform Delinking. If the <literal>External-Links</literal> setting is used then
+ this option actually enables delinking of the files. It defaults to on and
+ can be turned off with <option>-\-no-delink</option>.
+ Configuration Item: <literal>APT::FTPArchive::DeLinkAct</literal>.</para></listitem>
+-->
+ Delink を実行ã—ã¾ã™ã€‚
+ <literal>External-Links</literal> 設定を使用ã—ã¦ã„ã‚‹å ´åˆã€
+ ã“ã®ã‚ªãƒ—ションã¯ãƒ•ã‚¡ã‚¤ãƒ«ã® delink を有効ã«ã—ã¾ã™ã€‚
+ デフォルト㯠on ã§ã€
+ off ã«ã™ã‚‹ã«ã¯ <option>--no-delink</option> ã¨ã—ã¦ãã ã•ã„。
+ 設定項目 - <literal>APT::FTPArchive::DeLinkAct</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--contents</option></term>
+ <listitem><para>
+<!--
+ Perform contents generation. When this option is set and package indexes
+ are being generated with a cache DB then the file listing will also be
+ extracted and stored in the DB for later use. When using the generate
+ command this option also allows the creation of any Contents files. The
+ default is on.
+ Configuration Item: <literal>APT::FTPArchive::Contents</literal>.</para></listitem>
+-->
+ contents ã®ç”Ÿæˆã‚’è¡Œã„ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションを指定ã—ã€
+ パッケージインデックスをキャッシュ DB ã¨å…±ã«ç”Ÿæˆã™ã‚‹éš›ã€
+ ファイルリストを後ã§ä½¿ç”¨ã™ã‚‹ã‚ˆã†ã«ã€æŠ½å‡ºã— DB ã«æ ¼ç´ã—ã¾ã™ã€‚
+ generate コマンドを使用ã™ã‚‹éš›ã€
+ ã“ã®ã‚ªãƒ—ションã§ã„ãšã‚Œã® Contents ファイルも作æˆã§ãã¾ã™ã€‚
+ デフォルト㯠on ã§ã™ã€‚
+ 設定項目 - <literal>APT::FTPArchive::Contents</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term><term><option>--source-override</option></term>
+ <listitem><para>
+<!--
+ Select the source override file to use with the <literal>sources</literal> command.
+ Configuration Item: <literal>APT::FTPArchive::SourceOverride</literal>.</para></listitem>
+-->
+ <literal>sources</literal> コマンドã§ä½¿ç”¨ã™ã‚‹ã€
+ ソースオーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::FTPArchive::SourceOverride</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--readonly</option></term>
+ <listitem><para>
+<!--
+ Make the caching databases read only.
+ Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
+-->
+ キャッシュデータベースを読ã¿å–り専用ã«ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::FTPArchive::ReadOnlyDB</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+<refsect1><title>Examples</title>
+-->
+<refsect1><title>サンプル</title>
+
+<!--
+<para>To create a compressed Packages file for a directory containing
+binary packages (.deb):
+-->
+<para>ãƒã‚¤ãƒŠãƒªãƒ‘ッケージ (.deb) ãŒã‚るディレクトリã®
+Packages ファイルを生æˆã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®ã‚ˆã†ã«ã—ã¾ã™ã€‚
+
+<programlisting>
+<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>
+</programlisting></para>
+
+</refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-ftparchive</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+ <para><command>apt-ftparchive</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-get.ja.8.sgml b/doc/ja/apt-get.ja.8.sgml
deleted file mode 100644
index 156f83699..000000000
--- a/doc/ja/apt-get.ja.8.sgml
+++ /dev/null
@@ -1,857 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.12 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-get</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-get</>
-<!--
- <refpurpose>APT package handling utility - - command-line interface</>
--->
- <refpurpose>APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ -- ¥³¥Þ¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-get</>
- <arg><option>-hvs</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>update</>
- <arg>upgrade</>
- <arg>dselect-upgrade</>
- <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>check</>
- <arg>clean</>
- <arg>autoclean</>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>ÀâÌÀ</>
- <para>
-<!--
- <command/apt-get/ is the command-line tool for handling packages, and may be
- considered the user's "back-end" to other tools using the APT library.
--->
- <command/apt-get/ ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤òÁàºî¤¹¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¥Ä¡¼¥ë¤Ç¡¢
- APT ¥é¥¤¥Ö¥é¥ê¤òÍѤ¤¤ë¾¤Î¥Ä¡¼¥ë¤Î¥æ¡¼¥¶Â¦¥Ð¥Ã¥¯¥¨¥ó¥É¤È¤â¤¤¤¨¤ë¤â¤Î¤Ç¤¹¡£
- </para>
- <para>
-<!--
- Unless the <option/-h/, or <option/- -help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ ¤ä <option/--help/ ¤ò½ü¤­¡¢°Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£
- </para>
- <VariableList>
- <VarListEntry><Term>update</Term>
- <ListItem><Para>
-<!--
- <literal/update/ is used to resynchronize the package index files from
- their sources. The indexes of available packages are fetched from the
- location(s) specified in <filename>/etc/apt/sources.list</>.
- For example, when using a Debian archive, this command retrieves and
- scans the <filename>Packages.gz</> files, so that information about new
- and updated packages is available. An <literal/update/ should always be
- performed before an <literal/upgrade/ or <literal/dist-upgrade/. Please
- be aware that the overall progress meter will be incorrect as the size
- of the package files cannot be known in advance.
--->
- <literal/update/ ¤Ï¤½¤ì¤¾¤ì¼èÆÀ¸µ¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î
- ºÆƱ´ü¤ò¹Ô¤¦¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï
- <filename>/etc/apt/sources.list</> ¤Ëµ­½Ò¤·¤¿¾ì½ê¤«¤é¼èÆÀ¤·¤Þ¤¹¡£
- Î㤨¤Ð Debian archive ¤òÍøÍѤ¹¤ëºÝ¡¢¤³¤Î¥³¥Þ¥ó¥É¤¬ <filename>Packages.gz</>
- ¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤³¤È¤Ç¡¢¿·µ¬¤Þ¤¿¤Ï¹¹¿·¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤¬ÍøÍѲÄǽ
- ¤È¤Ê¤ê¤Þ¤¹¡£<literal/update/ ¤Ï <literal/upgrade/ ¤ä
- <literal/dist-upgrade/ ¤ò¹Ô¤¦Á°¤Ë¾ï¤Ë¼Â¹Ô¤¹¤ë¤Ù¤­¤Ç¤¹¡£
- Á°¤â¤Ã¤Æ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤òÃΤ뤳¤È¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢
- Á´ÂÎ¤Î¥×¥í¥°¥ì¥¹¥á¡¼¥¿¤ÏÀµ¤·¤¯É½¼¨¤µ¤ì¤Þ¤»¤ó¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>upgrade</Term>
- <ListItem><Para>
-<!--
- <literal/upgrade/ is used to install the newest versions of all packages
- currently installed on the system from the sources enumerated in
- <filename>/etc/apt/sources.list</>. Packages currently installed with
- new versions available are retrieved and upgraded; under no circumstances
- are currently installed packages removed, or packages not already installed
- retrieved and installed. New versions of currently installed packages that
- cannot be upgraded without changing the install status of another package
- will be left at their current version. An <literal/update/ must be
- performed first so that <command/apt-get/ knows that new versions of packages are
- available.
--->
- <literal/upgrade/ ¤Ï¡¢¸½ºß¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Î
- ºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤ò¡¢<filename>/etc/apt/sources.list</> ¤ËÎóµó¤·¤¿¼èÆÀ¸µ¤«¤é
- ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¿·¤·¤¤
- ¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ì¤Ð¹¹¿·¤·¤Þ¤¹¤¬¡¢¤¤¤«¤Ê¤ë»þ¤â¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î
- ¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ÂоݤΥѥ屡¼¥¸¤¬
- ¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¾õÂÖ¤òÊѹ¹¤»¤º¤Ë¹¹¿·¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
- ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¤Þ¤Þ¤È¤Ê¤ê¤Þ¤¹¡£
- <literal/update/ ¤ò¤Ï¤¸¤á¤Ë¼Â¹Ô¤·¤Æ¤ª¤¤¤Æ¡¢<command/apt-get/ ¤Ë
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬ÍøÍѤǤ­¤ë¤³¤È¤òÃΤ餻¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>dselect-upgrade</Term>
- <ListItem><Para>
-<!--
- is used in conjunction with the traditional Debian GNU/Linux packaging
- front-end, &dselect;. <literal/dselect-upgrade/
- follows the changes made by &dselect; to the <literal/Status/
- field of available packages, and performs the actions necessary to realize
- that state (for instance, the removal of old and the installation of new
- packages).
--->
- ÅÁÅýŪ¤Ê Debian GNU/Linux ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥Õ¥í¥ó¥È¥¨¥ó¥É¤Î &dselect;
- ¤È¶¦¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£<literal/dselect-upgrade/ ¤Ï &dselect; ¤Çºî¤é¤ì¤¿
- ÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤Î <literal/Status/ ¥Õ¥£¡¼¥ë¥É¤ÎÊѹ¹¤òÄÉÀפ·¡¢
- ¤½¤Î¾õÂÖ¤òÈ¿±Ç¤µ¤»¤ë¤Î¤ËɬÍפʥ¢¥¯¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
- (Î㤨¤Ð¡¢¸Å¤¤¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü¤ä¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ê¤É)
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>dist-upgrade</Term>
- <ListItem><Para>
-<!--
- <literal/dist-upgrade/, in addition to performing the function of
- <literal/upgrade/, also intelligently handles changing dependencies
- with new versions of packages; <command/apt-get/ has a "smart" conflict
- resolution system, and it will attempt to upgrade the most important
- packages at the expense of less important ones if necessary.
- The <filename>/etc/apt/sources.list</> file contains a list of locations
- from which to retrieve desired package files.
--->
- <literal/dist-upgrade/ ¤Ï <literal/upgrade/ ¤Îµ¡Ç½¤Ë²Ã¤¨¡¢¿·¥Ð¡¼¥¸¥ç¥ó¤Î
- ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë°Í¸´Ø·¸¤ÎÊѹ¹¤òÃÎŪ¤ËÁàºî¤·¤Þ¤¹¡£
- <command/apt-get/ ¤Ï¡ÖÀöÎý¤µ¤ì¤¿¡×¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ò»ý¤Á¡¢É¬Íפʤé
- Èæ³ÓŪ½ÅÍפǤʤ¤¥Ñ¥Ã¥±¡¼¥¸¤òµ¾À·¤Ë¤·¤Æ¡¢ºÇ½ÅÍץѥ屡¼¥¸¤Î¹¹¿·¤ò
- »î¤ß¤Þ¤¹¡£
- <filename>/etc/apt/sources.list</> ¥Õ¥¡¥¤¥ë¤ËɬÍפʥѥ屡¼¥¸¥Õ¥¡¥¤¥ë¤ò
- ¸¡º÷¤¹¤ë¾ì½ê¤Î¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>install</Term>
- <ListItem><Para>
-<!--
- <literal/install/ is followed by one or more packages desired for
- installation. Each package is a package name, not a fully qualified
- filename (for instance, in a Debian GNU/Linux system, libc6 would be the
- argument provided, not em(libc6_1.9.6-2.deb)). All packages required
- by the package(s) specified for installation will also be retrieved and
- installed. The <filename>/etc/apt/sources.list</> file is used to locate
- the desired packages. If a hyphen is appended to the package name (with
- no intervening space), the identified package will be removed if it is
- installed. Similarly a plus sign can be used to designate a package to
- install. These latter features may be used to override decisions made by
- apt-get's conflict resolution system.
--->
- <literal/install/ ¤Î¸å¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò1¤Ä°Ê¾å»ØÄꤷ¤Þ¤¹¡£
- »ØÄꤹ¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¤Ê¤¯¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£
- (Î㤨¤Ð Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï libc6_1.9.6-2.deb ¤Ç¤Ï¤Ê¤¯ libc6 ¤ò
- °ú¿ô¤È¤·¤ÆÍ¿¤¨¤Þ¤¹) ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦»ØÄꤷ¤¿¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·
- ¸¡º÷¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤¹¡£<filename>/etc/apt/sources.list</> ¥Õ¥¡¥¤¥ë
- ¤ò¡¢Í׵᤹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¾ì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£
- ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤í¤Ë (¶õÇò¤ò´Þ¤Þ¤º) ¥Ï¥¤¥Õ¥ó¤¬Äɲ䵤ì¤Æ¤¤¤ë¾ì¹ç¡¢
- ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ì¤Ðºï½ü¤·¤Þ¤¹¡£
- ƱÍͤˡ¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨¤¹¤ë¤Î¤Ë¥×¥é¥¹µ­¹æ¤â»ÈÍѤǤ­¤Þ¤¹¡£
- ¤³¤Îʸ»ú¤Ï apt-get ¤Î¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ÎȽÃǤËÍøÍѤµ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- </para>
- <para>
-<!--
- A specific version of a package can be selected for installation by
- following the package name with an equals and the version of the package
- to select. This will cause that version to be located and selected for
- install. Alternatively a specific distribution can be selected by
- following the package name with a slash and the version of the
- distribution or the Archive name (stable, frozen, unstable).
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¤¥³¡¼¥ëµ­¹æ¤È¥Ð¡¼¥¸¥ç¥ó¤ò³¤±¤ë¤³¤È¤Ç¡¢
- ÁªÂò¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- ¤Ä¤Þ¤ê»ØÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤ËÁªÂò
- ¤¹¤ë¤È¤¤¤¤¤¦¤³¤È¤Ç¤¹¡£
- Ê̤ÎÊýË¡¤È¤·¤Æ¤Ï¡¢¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÆÃÄꤹ¤ë¤Î¤Ë¡¢
- ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤Ë³¤¤¤Æ¥¹¥é¥Ã¥·¥å¤È¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤ä
- ¥¢¡¼¥«¥¤¥Ö̾ (stable, frozen, unstable) ¤òµ­½Ò¤Ç¤­¤Þ¤¹¡£
- </para>
- <para>
- ¥Ð¡¼¥¸¥ç¥óÁªÂòµ¡¹½¤Ï¥À¥¦¥ó¥°¥ì¡¼¥É»þ¤Ë¤â»ÈÍѤǤ­¤ë¤¿¤á¡¢Ãí°Õ¤òʧ¤Ã¤Æ
- »ÈÍѤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- </para>
- <para>
-<!--
- If no package matches the given expression and the expression contains one
- of '.', '?' or '*' then it is assumed to be a POSIX regex and it is applied
- to all package names in the database. Any matches are then installed (or
- removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
- and 'lowest'. If this is undesired prefix with a '^' character.
--->
- ¤â¤·'.'¡¢'?'¡¢'*'¤ò´Þ¤à¹½Ê¸¤Ë°ì¤Ä¤â¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¥Þ¥Ã¥Á¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
- POSIX Àµµ¬É½¸½¤Ç¤¢¤ë¤È¸«¤Ê¤·¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÁ´¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤Æ
- ŬÍѤ·¤Þ¤¹¡£
- ¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤¹¤Ù¤Æ¤¬¥¤¥ó¥¹¥È¡¼¥ë(¤â¤·¤¯¤Ïºï½ü)¤µ¤ì¤Þ¤¹¡£
- Ãí) 'lo.*' ¤Î¤è¤¦¤Êʸ»úÎó¤Ï 'how-lo' ¤ä 'lowest' ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
- ¤³¤ì¤ò˾¤Þ¤Ê¤±¤ì¤Ð¡¢ÀèƬ¤Ë '^' ¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>remove</Term>
- <ListItem><Para>
-<!--
- <literal/remove/ is identical to <literal/install/ except that packages are
- removed instead of installed. If a plus sign is appended to the package
- name (with no intervening space), the identified package will be
- installed.
--->
- <literal/remove/ ¤Ï ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¤³¤È¤ò½ü¤­¡¢<literal/install/
- ¤ÈƱÍͤǤ¹¡£
- ¥×¥é¥¹µ­¹æ¤¬¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë (´Ö¤Ë¶õÇò¤ò´Þ¤Þ¤º¤Ë) Éղ䵤줿¾ì¹ç¡¢
- ¼±Ê̤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>source</Term>
- <ListItem><Para>
-<!--
- <literal/source/ causes <command/apt-get/ to fetch source packages. APT
- will examine the available packages to decide which source package to
- fetch. It will then find and download into the current directory the
- newest available version of that source package. Source packages are
- tracked separately from binary packages via <literal/deb-src/ type lines
- in the &sources-list; file. This probably will mean that you will not
- get the same source as the package you have installed or as you could
- install. If the - -compile options is specified then the package will be
- compiled to a binary .deb using dpkg-buildpackage, if - -download-only is
- specified then the source package will not be unpacked.
--->
- <literal/source/ ¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤è¤¦ <command/apt-get/
- ¤¹¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
- APT ¤Ï¤É¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«·èÄꤹ¤ë¤è¤¦¡¢ÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ò
- ¸¡Æ¤¤·¤Þ¤¹¡£
- ¤½¤Î¸å¡¢ºÇ¿·¤ÎÍøÍѲÄǽ¤Ê¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¡¢¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ø
- ¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£
- ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤È¤ÏÊÌ¤Ë &sources-list; ¥Õ¥¡¥¤¥ë¤Î
- <literal/deb-src/ ¹Ô¤è¤êÄÉÀפµ¤ì¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ (¤Þ¤¿¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë) ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢
- ¼èÆÀ¸µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
- --compile ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢dpkg-buildpackage ¤òÍѤ¤¤Æ
- ¥Ð¥¤¥Ê¥ê .deb ¥Õ¥¡¥¤¥ë¤Ø¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£
- --download-only ¤Î¾ì¹ç¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òŸ³«¤·¤Þ¤»¤ó¡£
- </para>
- <para>
-<!--
- A specific source version can be retrieved by postfixing the source name
- with an equals and then the version to fetch, similar to the mechanism
- used for the package files. This enables exact matching of the source
- package name and version, implicitly enabling the
- <literal/APT::Get::Only-Source/ option.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤ÈƱÍͤˡ¢¥½¡¼¥¹Ì¾¤Î¸å¤í¤Ë¥¤¥³¡¼¥ë¤È¼èÆÀ¤·¤¿¤¤¥Ð¡¼¥¸¥ç¥ó¤ò
- ÃÖ¤¯¤³¤È¤Ç¡¢»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- <literal/APT::Get::Only-Source/ ¥ª¥×¥·¥ç¥ó¤Ç°ÅÌۤΤ¦¤Á¤ËÍ­¸ú¤Ë¤Ê¤Ã¤Æ
- ¤¤¤ë¤¿¤á¡¢¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥Ð¡¼¥¸¥ç¥ó¤Ë¸·Ì©¤Ë¥Þ¥Ã¥Á¥ó¥°¤¹¤ë¤è¤¦¤Ë
- ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
- </para>
-
- <para>
-<!--
- Note that source packages are not tracked like binary packages, they
- exist only in the current directory and are similar to downloading source
- tar balls.
--->
- Ãí) tar ball ¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ß¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¡¢
- ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ËŸ³«¤µ¤ì¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>build-dep</Term>
- <ListItem><Para>
-<!--
- <literal/build-dep/ causes apt-get to install/remove packages in an
- attempt to satisfy the build dependencies for a source packages.
--->
- <literal/build-dep/ ¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Î¹½Ã۰͸´Ø·¸¤òËþ¤¿¤¹¤è¤¦¤Ë¡¢
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦ºï½ü¤ò¹Ô¤¤¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>check</Term>
- <ListItem><Para>
-<!--
- <literal/check/ is a diagnostic tool; it updates the package cache and checks
- for broken dependencies.
--->
- <literal/check/ ¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Î¹¹¿·¤ä²õ¤ì¤¿°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤¹¤ë
- ¿ÇÃǥġ¼¥ë¤Ç¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>clean</Term>
- <ListItem><Para>
-<!--
- <literal/clean/ clears out the local repository of retrieved package
- files. It removes everything but the lock file from
- <filename>&cachedir;/archives/</> and
- <filename>&cachedir;/archive/partial/</>. When APT is used as a
- &dselect; method, <literal/clean/ is run automatically.
- Those who do not use dselect will likely want to run <literal/apt-get clean/
- from time to time to free up disk space.
- -->
- <literal/clean/ ¤Ï¼èÆÀ¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥í¡¼¥«¥ë¥ê¥Ý¥¸¥È¥ê¤òÁݽü¤·¤Þ¤¹¡£
- <filename>&cachedir;/archives/</> ¤È
- <filename>&cachedir;/archive/partial/</> ¤«¤é
- ¥í¥Ã¥¯¥Õ¥¡¥¤¥ë°Ê³°¤¹¤Ù¤Æºï½ü¤·¤Þ¤¹¡£
- APT ¤¬ &dselect; ¤«¤é¸Æ¤Ð¤ì¤ë¤È¤­¤Ë¤Ï¡¢¼«Æ°Åª¤Ë <literal/clean/ ¤¬
- ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
- dselect¤ò»ÈÍѤ·¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤ò²òÊü¤¹¤ë¤¿¤á¡¢»þ¡¹
- <literal/apt-get clean/ ¤ò¼Â¹Ô¤·¤¿¤¯¤Ê¤ë¤Ç¤·¤ç¤¦¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>autoclean</Term>
- <ListItem><Para>
-<!--
- Like <literal/clean/, <literal/autoclean/ clears out the local
- repository of retrieved package files. The difference is that it only
- removes package files that can no longer be downloaded, and are largely
- useless. This allows a cache to be maintained over a long period without
- it growing out of control. The configuration option
- <literal/APT::Clean-Installed/ will prevent installed packages from being
- erased if it is set off.
--->
- <literal/clean/ ƱÍÍ¡¢<literal/autoclean/ ¤Ï¼èÆÀ¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥í¡¼¥«¥ë
- ¥ê¥Ý¥¸¥È¥ê¤òÁݽü¤·¤Þ¤¹¡£°ã¤¤¤Ï¡¢¤â¤¦¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤ë¤³¤È¤¬¤Ê¤¤
- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ä¡¢¤Û¤È¤ó¤ÉÉÔÍפʥѥ屡¼¥¸¥Õ¥¡¥¤¥ë¤Î¤ß¤òºï½ü¤¹¤ë¤³¤È¤Ç¤¹¡£
- ¤³¤Î¤¿¤á¡¢Ä¹¤¤´ü´Ö¡¢¥­¥ã¥Ã¥·¥å¤¬´ÉÍý¤Ç¤­¤º¤ËÈîÂç²½¤¹¤ë¤³¤È¤Ê¤¯¡¢
- °Ý»ý¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- ÀßÄꥪ¥×¥·¥ç¥ó <literal/APT::Clean-Installed/ ¤Ë off ¤¬¥»¥Ã¥È¤·¤Æ¤¤¤ì¤Ð¡¢
- ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬ºï½ü¤µ¤ì¤ë¤Î¤òËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
- <RefSect1><Title>¥ª¥×¥·¥ç¥ó</>
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-d/</><term><option/--download-only/</>
- <ListItem><Para>
-<!--
- Download only; package files are only retrieved, not unpacked or installed.
- Configuration Item: <literal/APT::Get::Download-Only/.
--->
- ¥À¥¦¥ó¥í¡¼¥É¤Î¤ß - ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Î¤ß¤ò¹Ô¤¤¡¢
- Ÿ³«¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤»¤ó¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Download-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--fix-broken/</>
- <ListItem><Para>
-<!--
- Fix; attempt to correct a system with broken dependencies in
- place. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely soltion. Any Package that are specified
- must completly correct the problem. The option is sometimes necessary when
- running APT for the first time; APT itself does not allow broken package
- dependencies to exist on a system. It is possible that a system's
- dependency structure can be so corrupt as to require manual intervention
- (which usually means using &dselect; or <command/dpkg - -remove/ to eliminate some of
- the offending packages). Use of this option together with <option/-m/ may produce an
- error in some situations.
- Configuration Item: <literal/APT::Get::Fix-Broken/.
--->
- ½¤Éü - °Í¸´Ø·¸¤¬²õ¤ì¤¿¥·¥¹¥Æ¥à¤Î½¤Àµ¤ò»î¤ß¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò install ¤ä remove ¤È°ì½ï¤Ë»È¤¦¤È¤­¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò
- »ØÄꤷ¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤â¡¢´°Á´¤ËÌäÂê¤ò
- ²ò·è¤·¤Þ¤¹
- APT ¼«ÂΤϥ·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸°Í¸´Ø·¸¤òµö¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤
- ¤Î¤Ç¡¢½é¤á¤Æ APT ¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬Íפˤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£
- ¥·¥¹¥Æ¥à¤Î°Í¸´Ø·¸¹½Â¤¤Ë¤«¤Ê¤êÌäÂ꤬¤¢¤ë¾ì¹ç¤Ï¡¢¼êÆ°¤Ç½¤Àµ¤¹¤ë¤è¤¦
- Í׵᤹¤ë¤³¤È¤¬¤¢¤êÆÀ¤Þ¤¹¡£
- (Ä̾ï¤Ï¡¢ÌäÂê¤Î¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¼è¤ê½ü¤¯¤Î¤Ë&dselect; ¤ä
- <command/dpkg --remove/ ¤ò»ÈÍѤ·¤Þ¤¹)
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò <option/-m/ ¥ª¥×¥·¥ç¥ó¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢
- ¤¢¤ë¾õ¶·¤Ç¤Ï¥¨¥é¡¼¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Fix-Broken/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</>
- <term><option/--fix-missing/</>
- <ListItem><Para>
-<!--
- Ignore missing packages; If packages cannot be retrieved or fail the
- integrity check after retrieval (corrupted package files), hold back
- those packages and handle the result. Use of this option together with
- <option/-f/ may produce an error in some situations. If a package is
- selected for installation (particularly if it is mentioned on the
- command line) and it could not be downloaded then it will be silently
- held back.
- Configuration Item: <literal/APT::Get::Fix-Missing/.
--->
- ·çÍî¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë - ¥Ñ¥Ã¥±¡¼¥¸¤¬¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢
- (¥Ñ¥Ã¥±¡¼¥¸¤ÎÇË»¤Ç) ¼èÆÀ¤·¤¿¸å¤ÎÀ°¹çÀ­¥Á¥§¥Ã¥¯¤òÄ̤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
- ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î½èÍý¤òÊÝα¤·ºÇ¸å¤Þ¤Ç½èÍý¤ò³¤±¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò <option/-f/ ¥ª¥×¥·¥ç¥ó¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢
- ¤¢¤ë¾õ¶·¤Ç¤Ï¥¨¥é¡¼¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦ÁªÂò¤·¤Æ¤¤¤ë¾ì¹ç
- (Æä˥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤ÎÁàºî»þ) ¤ä¡¢¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë
- ¤Ê¤Ë¤âɽ¼¨¤»¤ºÊÝα¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Fix-Missing/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-download/</>
- <ListItem><Para>
-<!--
- Disables downloading of packages. This is best used with
- <option/- -ignore-missing/ to force APT to use only the .debs it has
- already downloaded.
- Configuration Item: <literal/APT::Get::Download/.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ò¤µ¤»¤Þ¤»¤ó¡£¤³¤ì¤Ï¤¹¤Ç¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿ .deb
- ¤ËÂФ·¤Æ¤Î¤ßAPT¤ò¹Ô¤¦ºÝ¤Ë¡¢<option/--ignore-missing/ ¤ÈÊ»¤»¤Æ
- »È¤¦¤Î¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Download/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-q/</><term><option/--quiet/</>
- <ListItem><Para>
-<!--
- Quiet; produces output suitable for logging, omitting progress indicators.
- More q's will produce more quiet up to a maximum of 2. You can also use
- <option/-q=#/ to set the quiet level, overriding the configuration file.
- Note that quiet level 2 implies <option/-y/, you should never use -qq
- without a no-action modifier such as -d, - -print-uris or -s as APT may
- decided to do something you did not expect.
- Configuration Item: <literal/quiet/.
--->
- ÀŲº - ¿ÊĽɽ¼¨¤ò¾Êά¤·¤Æ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£
- ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŤ«¤Ë¤Ç¤­¤Þ¤¹¡£
- ¤Þ¤¿¡¢<option/-q=#/ ¤Î¤è¤¦¤ËÀŲº¥ì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò
- ¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
- Ãí) ÀŲº¥ì¥Ù¥ë 2 ¤Ï <option/-y/ ¤Î°ÕÌ£¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
- APT ¤¬°Õ¿Þ¤·¤Ê¤¤·èÄê¤ò¹Ô¤¦¤«¤â¤·¤ì¤Ê¤¤¤Î¤Ç -d, --print-uris, -s ¤Î¤è¤¦¤Ê
- Áàºî¤ò¹Ô¤ï¤Ê¤¤¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤º¤Ë -qq ¤ò»ÈÍѤ¹¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
- ÀßÄê¹àÌÜ - <literal/quiet/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-s/</>
- <term><option/--simulate/</>
- <term><option/--just-print/</>
- <term><option/--dry-run/</>
- <term><option/--recon/</>
- <term><option/--no-act/</>
- <ListItem><Para>
-<!--
- No action; perform a simulation of events that would occur but do not
- actually change the system.
- Configuration Item: <literal/APT::Get::Simulate/.
--->
- Æ°ºî¤Ê¤· - ¤Ê¤Ë¤¬µ¯¤³¤ë¤Î¤«¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤¤¡¢
- ¼ÂºÝ¤Î¥·¥¹¥Æ¥àÊѹ¹¤Ï¤·¤Þ¤»¤ó¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Simulate/
- </para>
- <para>
-<!--
- Simulate prints out
- a series of lines each one representing a dpkg operation, Configure (Conf),
- Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
- and empty set of square brackets meaning breaks that are of no consequence
- (rare).
--->
- ¥·¥ß¥å¥ì¡¼¥È¤Î·ë²Ì¡¢dpkg ¤ÎÆ°ºî¤òɽ¤¹°ìÏ¢¤Î¹Ô¤Î¤½¤ì¤¾¤ì¤Ë¡¢ÀßÄê (Conf)¡¢
- ºï½ü (Remv)¡¢ Ÿ³« (Inst) ¤òɽ¼¨¤·¤Þ¤¹¡£
- ³Ñ¥«¥Ã¥³¤Ï²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤òɽ¤·¡¢¶õ¤Î³Ñ¥«¥Ã¥³¤ÏÂ礷¤¿ÌäÂê¤Ç¤Ï¤Ê¤¤¤³¤È¤ò
- ɽ¤·¤Þ¤¹(¤Þ¤ì¤Ç¤¹)¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-y/</><term><option/--yes/</>
- <term><option/--assume-yes/</>
- <ListItem><Para>
-<!--
- Automatic yes to prompts; assume "yes" as answer to all prompts and run
- non-interactively. If an undesirable situation, such as changing a held
- package or removing an essential package occurs then <literal/apt-get/
- will abort.
- Configuration Item: <literal/APT::Get::Assume-Yes/.
--->
- ¥×¥í¥ó¥×¥È¤Ø¤Î¼«Æ°¾µÂú - ¤¹¤Ù¤Æ¤Î¥×¥í¥ó¥×¥È¤Ë¼«Æ°Åª¤Ë "yes" ¤ÈÅú¤¨¡¢
- ÈóÂÐÏÃŪ¤Ë¼Â¹Ô¤·¤Þ¤¹¡£
- ÊÝα¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾õÂÖ¤òÊѹ¹¤·¤¿¤ê¡¢É¬¿Ü¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤è¤¦¤ÊÉÔŬÀڤʾõ¶·¤Î¾ì¹ç¡¢
- <literal/apt-get/ ¤ÏÃæÃǤ¹¤ë¤Ç¤·¤ç¤¦¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Assume-Yes/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</>
- <ListItem><Para>
-<!--
- Show upgraded packages; Print out a list of all packages that are to be
- upgraded.
- Configuration Item: <literal/APT::Get::Show-Upgraded/.
--->
- ¹¹¿·¥Ñ¥Ã¥±¡¼¥¸É½¼¨ - ¹¹¿·¤µ¤ì¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Show-Upgraded/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-b/</><term><option/--compile/</>
- <term><option/--build/</>
- <ListItem><Para>
-<!--
- Compile source packages after downloading them.
- Configuration Item: <literal/APT::Get::Compile/.
--->
- ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¸å¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Compile/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--ignore-hold/</>
- <ListItem><Para>
-<!--
- Ignore package Holds; This causes <command/apt-get/ to ignore a hold
- placed on a package. This may be useful in conjunction with
- <literal/dist-upgrade/ to override a large number of undesired holds.
- Configuration Item: <literal/APT::Ignore-Hold/.
--->
- ÊÝα¥Ñ¥Ã¥±¡¼¥¸Ìµ»ë - ¥Ñ¥Ã¥±¡¼¥¸¤ÎÊÝα»Ø¼¨¤ò̵»ë¤·¤Æ <command/apt-get/
- ¤ò¹Ô¤¤¤Þ¤¹¡£
- ÂçÎ̤Υѥ屡¼¥¸¤òÊÝα¤Î²ò½ü¤ò¤¹¤ë¤Î¤Ë <literal/dist-upgrade/ ¤È¶¦¤Ë
- »ÈÍѤ¹¤ë¤ÈÊØÍø¤Ç¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Ignore-Hold/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-upgrade/</>
- <ListItem><Para>
-<!--
- Do not upgrade packages; When used in conjunction with <literal/install/
- <literal/no-upgrade/ will prevent packages listed from being upgraded
- if they are already installed.
- Configuration Item: <literal/APT::Get::Upgrade/.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¹¹¿·¤Ê¤· - <literal/install/ ¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢
- <literal/no-upgrade/ ¤Ï»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤¬¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¢¤ë¾ì¹ç
- ¹¹¿·¤ò¹Ô¤¤¤Þ¤»¤ó¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Upgrade/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--force-yes/</>
- <ListItem><Para>
-<!--
- Force yes; This is a dangerous option that will cause apt to continue
- without prompting if it is doing something potentially harmful. It
- should not be used except in very special situations. Using
- <literal/force-yes/ can potentially destroy your system!
- Configuration Item: <literal/APT::Get::force-yes/.
--->
- ¶¯À©¾µÂú - APT ¤¬²¿¤«Â»½ý¤òÍ¿¤¨¤«¤Í¤Ê¤¤Æ°ºî¤ò¤·¤è¤¦¤È¤·¤¿¾ì¹ç¤Ç¤â¡¢
- ³Îǧ¤ÎÆþÎϤʤ·¤Ç¼Â¹Ô¤·¤Æ¤·¤Þ¤¦¡¢´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£
- ¤è¤Û¤É¤Î¾õ¶·¤Ç¤Ê¤±¤ì¤Ð¡¢»ÈÍѤ·¤Ê¤¤Êý¤¬¤¤¤¤¤Ç¤·¤ç¤¦¡£
- <literal/force-yes/ ¤Ï¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤«¤Í¤Þ¤»¤ó!
- ÀßÄê¹àÌÜ - <literal/APT::Get::force-yes/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--print-uris/</>
- <ListItem><Para>
-<!--
- Instead of fetching the files to install their URIs are printed. Each
- URI will have the path, the destination file name, the size and the expected
- md5 hash. Note that the file name to write to will not always match
- the file name on the remote site! This also works with the
- <literal/source/ and <literal/update/ commands. When used with the
- <literal/update/ command the MD5 and size are not included, and it is
- up to the user to decompress any compressed files.
- Configuration Item: <literal/APT::Get::Print-URIs/.
--->
- ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤¹¤ëÂå¤ï¤ê¤Ë¡¢¤½¤ÎURI¤òɽ¼¨¤·¤Þ¤¹¡£
- URI¤Ë¤Ï¡¢¥Ñ¥¹¡¢Âоݥե¡¥¤¥ë̾¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¡¢Í½Â¬¤µ¤ì¤ë md5 ¥Ï¥Ã¥·¥å
- ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
- Ãí) ½ÐÎϤ·¤¿¥Õ¥¡¥¤¥ë̾¤¬¡¢¾ï¤Ë¥ê¥â¡¼¥È¥µ¥¤¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ¹¤ë¤ï¤±
- ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! ¤³¤ì¤Ï <literal/source/ ¥³¥Þ¥ó¥É¡¢ <literal/update/
- ¥³¥Þ¥ó¥É¤Ç¤âÆ°ºî¤·¤Þ¤¹¡£
- MD5 ¤ä¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò´Þ¤Þ¤º <literal/update/ ¤Ç»ÈÍѤ·¤¿¤È¤­¤Ë¡¢
- °µ½Ì¥Õ¥¡¥¤¥ë¤òŸ³«¤¹¤ë¤³¤È¤Ï¥æ¡¼¥¶¤ÎÀÕǤ¤Ë¤ª¤¤¤Æ¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Print-URIs/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--purge/</>
- <ListItem><Para>
-<!--
- Use purge instead of remove for anything that would be removed.
- Configuration Item: <literal/APT::Get::Purge/.
--->
- ºï½ü¤¹¤ë¾ì¹ç¡¢ºï½ü¤Ç¤Ï¤Ê¤¯´°Á´ºï½ü¤ò»ÈÍѤ·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Purge/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--reinstall/</>
- <ListItem><Para>
-<!--
- Re-Install packages that are already installed and at the newest version.
- Configuration Item: <literal/APT::Get::ReInstall/.
--->
- ¤¹¤Ç¤ËºÇ¿·ÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Æ¤â¡¢¥Ñ¥Ã¥±¡¼¥¸¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::ReInstall/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--list-cleanup/</>
- <ListItem><Para>
-<!--
- This option defaults to on, use <literal/- -no-list-cleanup/ to turn it
- off. When on <command/apt-get/ will automatically manage the contents of
- <filename>&statedir;/lists</> to ensure that obsolete files are erased.
- The only reason to turn it off is if you frequently change your source
- list.
- Configuration Item: <literal/APT::Get::List-Cleanup/.
--->
- ¤³¤Îµ¡Ç½¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç ON ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
- OFF ¤Ë¤¹¤ë¤Ë¤Ï <literal/--no-list-cleanup/ ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£
- ON ¤Î¾ì¹ç¡¢<command/apt-get/ ¤Ï¸Å¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤ò³Î¼Â¤Ë¾Ãµî¤¹¤ë¤¿¤á¡¢
- ¼«Æ°Åª¤Ë <filename>&statedir;/lists</> ¤ÎÃæ¿È¤ò´ÉÍý¤¹¤ë¤Ç¤·¤ç¤¦¡£
- ¤³¤ì¤ò OFF ¤Ë¤¹¤ë¤Î¤Ï¡¢¤¢¤Ê¤¿¤¬¼èÆÀ¸µ¥ê¥¹¥È¤òÉÑÈˤËÊѹ¹¤¹¤ë»þ¤°¤é¤¤¤Ç¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::List-Cleanup/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-t/</>
- <term><option/--target-release/</>
- <term><option/--default-release/</>
- <ListItem><Para>
-<!--
- This option controls the default input to the policy engine, it creates
- a default pin at priority 990 using the specified release string. The
- preferences file may further override this setting. In short, this option
- lets you have simple control over which distribution packages will be
- retrieved from. Some common examples might be
- <option>-t '2.1*'</> or <option>-t unstable</>.
- Configuration Item: <literal/APT::Default-Release/
--->
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ý¥ê¥·¡¼¥¨¥ó¥¸¥ó¤Ø¤Î¥Ç¥Õ¥©¥ë¥ÈÆþÎϤòÀ©¸æ¤·¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢»ØÄꤵ¤ì¤¿¥ê¥ê¡¼¥¹Ê¸»úÎó¤ò»ÈÍѤ·¡¢¥Ç¥Õ¥©¥ë¥È pin ¤òÍ¥ÀèÅÙ 990
- ¤ÇºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£
- Í¥Àè¥Õ¥¡¥¤¥ë¤Ï¤³¤ÎÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£
- Íפ¹¤ë¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¤É¤ÎÇÛÉۥѥ屡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«¤ò´Êñ¤Ë
- ´ÉÍý¤·¤Æ¤¤¤Þ¤¹¡£
- ¤¤¤¯¤Ä¤«°ìÈÌŪ¤ÊÎã¤Ï¡¢<option>-t '2.1*'</> ¤ä <option>-t unstable</>
- ¤Ç¤·¤ç¤¦¡£
- ÀßÄê¹àÌÜ - <literal/APT::Default-Release/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--trivial-only/</>
- <ListItem><Para>
-<!--
- Only perform operations that are 'trivial'. Logically this can be considered
- related to <option/- -assume-yes/, where <option/- -assume-yes/ will answer
- yes to any prompt, <option/- -trivial-only/ will answer no.
- Configuration Item: <literal/APT::Get::Trivial-Only/.
--->
- ¡Ö½ÅÍפǤʤ¤¡×Áàºî¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£¤³¤ì¤ÏÏÀÍýŪ¤Ë <option/--assume-yes/ ¤Î
- Ãç´Ö¤È¸«¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£<option/--assume-yes/ ¤Ï¼ÁÌä¤Ë¤¹¤Ù¤Æ yes ¤È
- Åú¤¨¤Þ¤¹¤¬¡¢<option/--trivial-only/ ¤Ï¤¹¤Ù¤Æ no ¤ÈÅú¤¨¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Trivial-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-remove/</>
- <ListItem><Para>
-<!--
- If any packages are to be removed apt-get immediately aborts without
- prompting.
- Configuration Item: <literal/APT::Get::Remove/
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¾õ¶·¤Ë¤Ê¤Ã¤¿¤È¤­¡¢¥×¥í¥ó¥×¥È¤òɽ¼¨¤»¤ºÃæÃǤ·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Remove/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--only-source/</>
- <ListItem><Para>
-<!--
- Only has meaning for the <literal/source/ command. indicates that the
- given source names are not to be mapped through the binary table.
- Configuration Item: <literal/APT::Get::Only-Source/
--->
- <literal/source/ ¥³¥Þ¥ó¥É¤Ç¤Î¤ß°ÕÌ£¤¬¤¢¤ê¤Þ¤¹¡£
- »ØÄꤵ¤ì¤¿¥½¡¼¥¹Ì¾¤¬¥Ð¥¤¥Ê¥ê¥Æ¡¼¥Ö¥ë¤Ë¥Þ¥Ã¥×¤µ¤ì¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Only-Source/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</>
- <ListItem><Para>
-<!--
- Download only the diff or tar file of a source archive.
- Configuration Item: <literal/APT::Get::Diff-Only/ and
- <literal/APT::Get::Tar-Only/
--->
- ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î diff ¥Õ¥¡¥¤¥ë¤ä tar ¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Diff-Only/ ¤È <literal/APT::Get::Tar-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--arch-only/</>
- <ListItem><Para>
-<!--
- Only process architecture-dependent build-dependencies.
- Configuration Item: <literal/APT::Get::Arch-Only/
--->
- ¹½Ã۰͸´Ø·¸¤Î²ò·è¤ò¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤¿¤â¤Î¤Î¤ß¹Ô¤¤¤Þ¤¹¡£
- ÀßÄê¹àÌÜ - <literal/APT::Get::Arch-Only/
- </Para></ListItem>
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
- <RefSect1><Title>¥Õ¥¡¥¤¥ë</>
- <variablelist>
- <VarListEntry><term><filename>/etc/apt/sources.list</></term>
- <ListItem><Para>
-<!--
- locations to fetch packages from.
- Configuration Item: <literal/Dir::Etc::SourceList/.
--->
- ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Etc::SourceList/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/apt.conf</></term>
- <ListItem><Para>
-<!--
- APT configuration file.
- Configuration Item: <literal/Dir::Etc::Main/.
--->
- APT ÀßÄê¥Õ¥¡¥¤¥ë¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Etc::Main/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term>
- <ListItem><Para>
-<!--
- APT configuration file fragments
- Configuration Item: <literal/Dir::Etc::Parts/.
--->
- APT ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃÇÊÒ¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Etc::Parts/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/preferences</></term>
- <ListItem><Para>
-<!--
- version preferences file
- Configuration Item: <literal/Dir::Etc::Preferences/.
--->
- ¥Ð¡¼¥¸¥ç¥óÍ¥Àè¥Õ¥¡¥¤¥ë¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Etc::Preferences/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&cachedir;/archives/</></term>
- <ListItem><Para>
-<!--
- storage area for retrieved package files.
- Configuration Item: <literal/Dir::Cache::Archives/.
--->
- ¼èÆÀºÑ¤ß¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Cache::Archives/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for package files in transit.
- Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial).
--->
- ¼èÆÀÃæ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::Cache::Archives/ (ɬÁ³Åª¤ËÉÔ´°Á´¤Ç¤¹)
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/</></term>
- <ListItem><Para>
-<!--
- storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal/Dir::State::Lists/.
--->
- &sources-list; ¤Î¥Ñ¥Ã¥±¡¼¥¸»ñ¸»ÆÃÍ­¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::State::Lists/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for state information in transit.
- Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
- ¼èÆÀÃæ¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£
- ÀßÄê¹àÌÜ - <literal/Dir::State::Lists/ (ɬÁ³Åª¤ËÉÔ´°Á´¤Ç¤¹)
- </Para></ListItem>
- </VarListEntry>
- </variablelist>
- </RefSect1>
-
- <RefSect1><Title>´ØÏ¢¹àÌÜ</>
- <para>
- &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;,
- &docdir;¤Î APT ¥æ¡¼¥¶¡¼¥º¥¬¥¤¥É, &apt-preferences;
- </para>
- </RefSect1>
-
- <RefSect1><Title>¿ÇÃÇ¥á¥Ã¥»¡¼¥¸</>
- <para>
- <command/apt-get/ ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£
- ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£
- </para>
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
diff --git a/doc/ja/apt-get.ja.8.xml b/doc/ja/apt-get.ja.8.xml
new file mode 100644
index 000000000..f503b89ef
--- /dev/null
+++ b/doc/ja/apt-get.ja.8.xml
@@ -0,0 +1,900 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-get</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-get</refname>
+<!--
+ <refpurpose>APT package handling utility -\- command-line interface</refpurpose>
+-->
+ <refpurpose>APT package handling utility -- コマンドラインインターフェース</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-get</command>
+ <arg><option>-hvs</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>update</arg>
+ <arg>upgrade</arg>
+ <arg>dselect-upgrade</arg>
+ <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>check</arg>
+ <arg>clean</arg>
+ <arg>autoclean</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-get</command> is the command-line tool for handling packages, and may be
+ considered the user's "back-end" to other tools using the APT
+ library. Several "front-end" interfaces exist, such as dselect(8),
+ aptitude, synaptic, gnome-apt and wajig.</para>
+-->
+ <para><command>apt-get</command> ã¯ã€
+ パッケージをæ“作ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ„ールã§ã€
+ APT ライブラリを用ã„ã‚‹ä»–ã®ãƒ„ールã®ãƒ¦ãƒ¼ã‚¶å´ã€Œãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã€ã¨ã„ãˆã‚‹ã‚‚ã®ã§ã™ã€‚
+ 「フロントエンドã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã«ã¯ã€dselect(8),
+ aptitude, synaptic, gnome-apt, wajig ãªã©ãŒã‚ã‚Šã¾ã™ã€‚</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除ãã€
+ 以下ã«æŒ™ã’るコマンドãŒå¿…è¦ã§ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>update</term>
+<!--
+ <listitem><para><literal>update</literal> is used to resynchronize the package index files from
+ their sources. The indexes of available packages are fetched from the
+ location(s) specified in <filename>/etc/apt/sources.list</filename>.
+ For example, when using a Debian archive, this command retrieves and
+ scans the <filename>Packages.gz</filename> files, so that information about new
+ and updated packages is available. An <literal>update</literal> should always be
+ performed before an <literal>upgrade</literal> or <literal>dist-upgrade</literal>. Please
+ be aware that the overall progress meter will be incorrect as the size
+ of the package files cannot be known in advance.</para></listitem>
+-->
+ <listitem><para><literal>update</literal>ã¯ã€
+ å–å¾—å…ƒã‹ã‚‰ãƒ‘ッケージインデックスファイルã®å†åŒæœŸã‚’è¡Œã†ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ 利用å¯èƒ½ãªãƒ‘ッケージã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã¯ã€
+ <filename>/etc/apt/sources.list</filename> ã«è¨˜è¿°ã—ãŸå ´æ‰€ã‹ã‚‰å–å¾—ã—ã¾ã™ã€‚
+ 例ãˆã° Debian アーカイブを利用ã™ã‚‹éš›ã€
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ãŒ <filename>Packages.gz</filename> ファイルを検索ã™ã‚‹ã“ã¨ã§ã€
+ æ–°è¦ã¾ãŸã¯æ›´æ–°ã•ã‚ŒãŸãƒ‘ッケージã®æƒ…å ±ãŒåˆ©ç”¨å¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚
+ <literal>update</literal> ã¯ã€<literal>upgrade</literal> ã‚„
+ <literal>dist-upgrade</literal> ã‚’è¡Œã†å‰ã«å¸¸ã«å®Ÿè¡Œã—ã¦ãã ã•ã„。
+ å‰ã‚‚ã£ã¦ãƒ‘ッケージファイルã®ã‚µã‚¤ã‚ºã‚’知るã“ã¨ãŒã§ããªã„ãŸã‚ã€
+ 全体ã®é€²æ—メータã¯æ­£ã—ã表示ã•ã‚Œã¾ã›ã‚“。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>upgrade</term>
+<!--
+ <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages
+ currently installed on the system from the sources enumerated in
+ <filename>/etc/apt/sources.list</filename>. Packages currently installed with
+ new versions available are retrieved and upgraded; under no circumstances
+ are currently installed packages removed, or packages not already installed
+ retrieved and installed. New versions of currently installed packages that
+ cannot be upgraded without changing the install status of another package
+ will be left at their current version. An <literal>update</literal> must be
+ performed first so that <command>apt-get</command> knows that new versions of packages are
+ available.</para></listitem>
+-->
+ <listitem><para><literal>upgrade</literal> ã¯ã€
+ ç¾åœ¨ã‚·ã‚¹ãƒ†ãƒ ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„る全パッケージã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ã€
+ <filename>/etc/apt/sources.list</filename>
+ ã«åˆ—挙ã—ãŸå–å¾—å…ƒã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ ç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä¸­ã®ãƒ‘ッケージã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã‚Œã°æ›´æ–°ã—ã¾ã™ãŒã€
+ ã„ã‹ãªã‚‹æ™‚ã‚‚ç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä¸­ã®ãƒ‘ッケージã®å‰Šé™¤ã¯è¡Œã„ã¾ã›ã‚“。
+ 対象ã®ãƒ‘ッケージãŒã€
+ ä»–ã®ãƒ‘ッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«çŠ¶æ…‹ã‚’変更ã›ãšã«æ›´æ–°ã§ããªã„å ´åˆã¯ã€
+ ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã¾ã¾ã¨ãªã‚Šã¾ã™ã€‚
+ 最åˆã« <literal>update</literal> を実行ã—ã¦ãŠãã€
+ <command>apt-get</command> ã«ãƒ‘ッケージã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã‚‹ã“ã¨ã‚’
+ 知らã›ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dselect-upgrade</term>
+<!--
+ <listitem><para><literal>dselect-upgrade</literal>
+ is used in conjunction with the traditional Debian packaging
+ front-end, &dselect;. <literal>dselect-upgrade</literal>
+ follows the changes made by &dselect; to the <literal>Status</literal>
+ field of available packages, and performs the actions necessary to realize
+ that state (for instance, the removal of old and the installation of new
+ packages).</para></listitem>
+-->
+ <listitem><para><literal>dselect-upgrade</literal> ã¯ã€
+ ä¼çµ±çš„㪠Debian GNU/Linux パッケージ管ç†ãƒ•ãƒ­ãƒ³ãƒˆã‚¨ãƒ³ãƒ‰ã® &dselect;
+ ã¨å…±ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚
+ <literal>dselect-upgrade</literal> ã¯ã€
+ &dselect; ã§ä½œã‚‰ã‚ŒãŸåˆ©ç”¨å¯èƒ½ãƒ‘ッケージã®
+ <literal>Status</literal> フィールドã®å¤‰æ›´ã‚’追跡ã—ã€
+ ãã®çŠ¶æ…‹ã‚’å映ã•ã›ã‚‹ã®ã«å¿…è¦ãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’実行ã—ã¾ã™ã€‚
+ (例ãˆã°ã€å¤ã„パッケージã®å‰Šé™¤ã‚„æ–°ã—ã„パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãªã©) </para></listitem>
+
+ </varlistentry>
+
+ <varlistentry><term>dist-upgrade</term>
+<!--
+ <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of
+ <literal>upgrade</literal>, also intelligently handles changing dependencies
+ with new versions of packages; <command>apt-get</command> has a "smart" conflict
+ resolution system, and it will attempt to upgrade the most important
+ packages at the expense of less important ones if necessary.
+ The <filename>/etc/apt/sources.list</filename> file contains a list of locations
+ from which to retrieve desired package files.
+ See also &apt-preferences; for a mechanism for
+ overriding the general settings for individual packages.</para></listitem>
+-->
+ <listitem><para><literal>dist-upgrade</literal> ã¯ã€
+ <literal>upgrade</literal> ã®æ©Ÿèƒ½ã«åŠ ãˆã€
+ æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージã«å¯¾ã™ã‚‹ä¾å­˜é–¢ä¿‚ã®å¤‰æ›´ã‚’知的ã«æ“作ã—ã¾ã™ã€‚
+ <command>apt-get</command> ã¯ã€Œæ´—ç·´ã•ã‚ŒãŸã€ç«¶åˆè§£æ±ºã‚·ã‚¹ãƒ†ãƒ ã‚’æŒã¡ã€
+ å¿…è¦ã¨ã‚らã°æ¯”較的é‡è¦ã§ãªã„パッケージを犠牲ã«ã—ã¦ã€
+ 最é‡è¦ãƒ‘ッケージã®æ›´æ–°ã‚’試ã¿ã¾ã™ã€‚
+ <filename>/etc/apt/sources.list</filename> ファイルã«ã¯ã€
+ å¿…è¦ãªãƒ‘ッケージファイルを検索ã™ã‚‹å ´æ‰€ã®ãƒªã‚¹ãƒˆãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚
+ 特定ã®ãƒ‘ッケージå‘ã‘ã«ã€ä¸€èˆ¬çš„ãªè¨­å®šã‚’上書ãã™ã‚‹æ©Ÿæ§‹ã«ã¤ã„ã¦ã¯ã€
+ &apt-preferences; ã‚’ã”覧ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>install</term>
+<!--
+ <listitem><para><literal>install</literal> is followed by one or more packages desired for
+ installation. Each package is a package name, not a fully qualified
+ filename (for instance, in a Debian GNU/Linux system, libc6 would be the
+ argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required
+ by the package(s) specified for installation will also be retrieved and
+ installed. The <filename>/etc/apt/sources.list</filename> file is used to locate
+ the desired packages. If a hyphen is appended to the package name (with
+ no intervening space), the identified package will be removed if it is
+ installed. Similarly a plus sign can be used to designate a package to
+ install. These latter features may be used to override decisions made by
+ apt-get's conflict resolution system.</para>
+-->
+ <listitem><para><literal>install</literal> ã®å¾Œã«ã¯ã€
+ インストールã™ã‚‹ãƒ‘ッケージを 1 ã¤ä»¥ä¸ŠæŒ‡å®šã—ã¾ã™ã€‚
+ 指定ã™ã‚‹ãƒ‘ッケージã¯ã€å®Œå…¨ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã¯ãªãパッケージåã§ã™ã€‚
+ (例ãˆã° Debian GNU/Linux システムã§ã¯ã€
+ <literal>libc6_1.9.6-2.deb</literal> ã§ã¯ãªã libc6 を引数ã¨ã—ã¦ä¸Žãˆã¾ã™)
+ インストールã™ã‚‹ã‚ˆã†æŒ‡å®šã—ãŸã™ã¹ã¦ã®ãƒ‘ッケージã«å¯¾ã—ã€
+ 検索・インストールを行ã„ã¾ã™ã€‚
+ <filename>/etc/apt/sources.list</filename> ファイルをã€
+ è¦æ±‚ã™ã‚‹ãƒ‘ッケージã®å ´æ‰€ã‚’特定ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ パッケージåã®å¾Œã‚ã« (空白をå«ã¾ãš) ãƒã‚¤ãƒ•ãƒ³ãŒè¿½åŠ ã•ã‚Œã¦ã„ã‚‹å ´åˆã€
+ ãã®ãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚Œã°å‰Šé™¤ã—ã¾ã™ã€‚
+ åŒæ§˜ã«ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ãƒ‘ッケージを明示ã™ã‚‹ã®ã«ãƒ—ラス記å·ã‚‚使用ã§ãã¾ã™ã€‚
+ ã“ã®è¨˜å·ã¯ apt-get ã®ç«¶åˆè§£æ±ºã‚·ã‚¹ãƒ†ãƒ ã®åˆ¤æ–­ã«åˆ©ç”¨ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</para>
+
+<!--
+ <para>A specific version of a package can be selected for installation by
+ following the package name with an equals and the version of the package
+ to select. This will cause that version to be located and selected for
+ install. Alternatively a specific distribution can be selected by
+ following the package name with a slash and the version of the
+ distribution or the Archive name (stable, testing, unstable).</para>
+-->
+ <para>パッケージã«ã‚¤ã‚³ãƒ¼ãƒ«è¨˜å·ã¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’続ã‘ã‚‹ã“ã¨ã§ã€
+ é¸æŠžã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ ã¤ã¾ã‚Šã€æŒ‡å®šã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã™ã‚‹ã‚ˆã†ã«é¸æŠžã™ã‚‹ã€
+ ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+ 別ã®æ–¹æ³•ã¨ã—ã¦ã¯ã€ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションを特定ã™ã‚‹ã®ã«ã€
+ パッケージåã«ç¶šã‘ã¦ã€
+ スラッシュã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚„アーカイブå
+ (stable, testing, unstable) を記述ã§ãã¾ã™ã€‚</para>
+
+<!--
+ <para>Both of the version selection mechanisms can downgrade packages and must
+ be used with care.</para>
+-->
+ <para>ãƒãƒ¼ã‚¸ãƒ§ãƒ³é¸æŠžæ©Ÿæ§‹ã¯ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰æ™‚ã«ã‚‚使用ã§ãã‚‹ãŸã‚ã€
+ 注æ„ã—ã¦ä½¿ç”¨ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。</para>
+
+<!--
+ <para>Finally, the &apt-preferences; mechanism allows you to
+ create an alternative installation policy for
+ individual packages.</para>
+-->
+ <para>最後ã«ã€&apt-preferences; 機構ã«ã‚ˆã‚Šã€
+ 特定ã®ãƒ‘ッケージã«å¯¾ã™ã‚‹ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒãƒªã‚·ãƒ¼ã‚’作æˆã§ãã¾ã™ã€‚</para>
+
+<!--
+ <para>If no package matches the given expression and the expression contains one
+ of '.', '?' or '*' then it is assumed to be a POSIX regular expression,
+ and it is applied
+ to all package names in the database. Any matches are then installed (or
+ removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
+ and 'lowest'. If this is undesired, anchor the regular expression
+ with a '^' or '$' character, or create a more specific regular expression.</para></listitem>
+-->
+ <para>構文㫠'.', '?', '*' ã‚’å«ã¿ã€ãƒ‘ッケージåãŒãƒžãƒƒãƒã—ãªã‹ã£ãŸå ´åˆã€
+ POSIX æ­£è¦è¡¨ç¾ã§ã‚ã‚‹ã¨è¦‹ãªã—ã€
+ データベース内ã®å…¨ãƒ‘ッケージåã«å¯¾ã—ã¦é©ç”¨ã—ã¾ã™ã€‚
+ マッãƒã—ãŸãƒ‘ッケージã™ã¹ã¦ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«(ã‚‚ã—ãã¯å‰Šé™¤)ã•ã‚Œã¾ã™ã€‚
+ 'lo.*' ã®ã‚ˆã†ãªæ–‡å­—列ã¯ã€
+ 'how-lo' ã‚„ 'lowest' ã«ãƒžãƒƒãƒã™ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ ãã†ã—ãŸããªã‘ã‚Œã°ã€'^' ã‚„ '$' を付ã‘ã‚‹ã‹ã€
+ ã‚‚ã£ã¨è©³ã—ã„æ­£è¦è¡¨ç¾ã‚’指定ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>remove</term>
+<!--
+ <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are
+ removed instead of installed. If a plus sign is appended to the package
+ name (with no intervening space), the identified package will be
+ installed instead of removed.</para></listitem>
+-->
+ <listitem><para><literal>remove</literal> ã¯ã€
+ パッケージãŒå‰Šé™¤ã•ã‚Œã‚‹ã“ã¨ã‚’除ãã€<literal>install</literal> ã¨åŒæ§˜ã§ã™ã€‚
+ プラス記å·ãŒãƒ‘ッケージåã« (é–“ã«ç©ºç™½ã‚’å«ã¾ãšã«) 付加ã•ã‚Œã‚‹ã¨ã€
+ 識別ã•ã‚ŒãŸãƒ‘ッケージをã€å‰Šé™¤ã§ã¯ãªãインストールã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>source</term>
+<!--
+ <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT
+ will examine the available packages to decide which source package to
+ fetch. It will then find and download into the current directory the
+ newest available version of that source package. Source packages are
+ tracked separately from binary packages via <literal>deb-src</literal> type lines
+ in the &sources-list; file. This probably will mean that you will not
+ get the same source as the package you have installed or as you could
+ install. If the -\-compile options is specified then the package will be
+ compiled to a binary .deb using dpkg-buildpackage, if -\-download-only is
+ specified then the source package will not be unpacked.</para>
+-->
+ <listitem><para><literal>source</literal> ã¯ã€
+ ソースパッケージをå–å¾—ã™ã‚‹ã®ã« <command>apt-get</command> ã—ã¾ã™ã€‚
+ APT ã¯ã©ã®ã‚½ãƒ¼ã‚¹ãƒ‘ッケージをå–å¾—ã™ã‚‹ã‹æ±ºå®šã™ã‚‹ã‚ˆã†ã€
+ 利用å¯èƒ½ãªãƒ‘ッケージを検討ã—ã¾ã™ã€‚
+ ãã®å¾Œã€æœ€æ–°ã®åˆ©ç”¨å¯èƒ½ãªã‚½ãƒ¼ã‚¹ãƒ‘ッケージを見ã¤ã‘ã€
+ カレントディレクトリã¸ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ã¾ã™ã€‚
+ ãƒã‚¤ãƒŠãƒªãƒ‘ッケージã¨ã¯åˆ¥ã« &sources-list; ファイルã®
+ <literal>deb-src</literal> è¡Œã‹ã‚‰ã€ã‚½ãƒ¼ã‚¹ãƒ‘ッケージを追跡ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—㟠(ã¾ãŸã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã‚‹) パッケージã¨ã€
+ å–得元を変ãˆã‚‹ã“ã¨ãŒã§ãã‚‹ã“ã¨ã‚’示ã—ã¦ã„ã¾ã™ã€‚
+ --compile オプションãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€dpkg-buildpackage を用ã„ã¦
+ ãƒã‚¤ãƒŠãƒª .deb ファイルã¸ã‚³ãƒ³ãƒ‘イルを行ã„ã¾ã™ã€‚
+ --download-only ã®å ´åˆã¯ã‚½ãƒ¼ã‚¹ãƒ‘ッケージを展開ã—ã¾ã›ã‚“。</para>
+
+<!--
+ <para>A specific source version can be retrieved by postfixing the source name
+ with an equals and then the version to fetch, similar to the mechanism
+ used for the package files. This enables exact matching of the source
+ package name and version, implicitly enabling the
+ <literal>APT::Get::Only-Source</literal> option.</para>
+-->
+ <para>パッケージã¨åŒæ§˜ã«ã€
+ ソースåã®å¾Œã‚ã«ã‚¤ã‚³ãƒ¼ãƒ«ã¨å–å¾—ã—ãŸã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ç½®ãã¨ã€
+ 指定ã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚½ãƒ¼ã‚¹ã‚’å–å¾—ã§ãã¾ã™ã€‚
+ <literal>APT::Get::Only-Source</literal>
+ オプションãŒæš—é»™ã®ã†ã¡ã«æœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ãŸã‚ã€
+ ソースパッケージåã¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«åŽ³å¯†ã«ä¸€è‡´ã•ã›ã¦ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>Note that source packages are not tracked like binary packages, they
+ exist only in the current directory and are similar to downloading source
+ tar balls.</para></listitem>
+-->
+ <para>tar ball ã¯ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã®ã¿ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã•ã‚Œã€
+ カレントディレクトリã«å±•é–‹ã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>build-dep</term>
+<!--
+ <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an
+ attempt to satisfy the build dependencies for a source package.</para></listitem>
+-->
+ <listitem><para><literal>build-dep</literal> ã¯ã€
+ ソースパッケージã®æ§‹ç¯‰ä¾å­˜é–¢ä¿‚を満ãŸã™ã‚ˆã†ã«ã€
+ パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒ»å‰Šé™¤ã‚’è¡Œã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>check</term>
+<!--
+ <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks
+ for broken dependencies.</para></listitem>
+-->
+ <listitem><para><literal>check</literal> ã¯ã€
+ パッケージキャッシュã®æ›´æ–°ã‚„壊れãŸä¾å­˜é–¢ä¿‚ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹è¨ºæ–­ãƒ„ールã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>clean</term>
+<!--
+ <listitem><para><literal>clean</literal> clears out the local repository of retrieved package
+ files. It removes everything but the lock file from
+ <filename>&cachedir;/archives/</filename> and
+ <filename>&cachedir;/archives/partial/</filename>. When APT is used as a
+ &dselect; method, <literal>clean</literal> is run automatically.
+ Those who do not use dselect will likely want to run <literal>apt-get clean</literal>
+ from time to time to free up disk space.</para></listitem>
+-->
+ <listitem><para><literal>clean</literal> ã¯ã€
+ å–å¾—ã—ãŸãƒ‘ッケージã®ãƒ­ãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã‚’掃除ã—ã¾ã™ã€‚
+ <filename>&cachedir;/archives/</filename> ã¨
+ <filename>&cachedir;/archives/partial/</filename>
+ ã‹ã‚‰ãƒ­ãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ä»¥å¤–ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã€‚
+ APT ㌠&dselect; ã‹ã‚‰å‘¼ã°ã‚Œã‚‹ã¨ãã«ã¯ã€
+ 自動的㫠<literal>clean</literal> ãŒå®Ÿè¡Œã•ã‚Œã¾ã™ã€‚
+ dselectを使用ã—ãªã„å ´åˆã¯ã€ãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã‚’解放ã™ã‚‹ãŸã‚ã€æ™‚々
+ <literal>apt-get clean</literal> を実行ã—ãŸããªã‚‹ã§ã—ょã†ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>autoclean</term>
+<!--
+ <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local
+ repository of retrieved package files. The difference is that it only
+ removes package files that can no longer be downloaded, and are largely
+ useless. This allows a cache to be maintained over a long period without
+ it growing out of control. The configuration option
+ <literal>APT::Clean-Installed</literal> will prevent installed packages from being
+ erased if it is set to off.</para></listitem>
+-->
+ <listitem><para><literal>clean</literal> ã¨åŒæ§˜ã«ã€
+ <literal>autoclean</literal> ã¯å–å¾—ã—ãŸãƒ‘ッケージã®ãƒ­ãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã‚’掃除ã—ã¾ã™ã€‚
+ é•ã„ã¯ã€ã‚‚ã†ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã•ã‚Œã‚‹ã“ã¨ãŒãªã„パッケージファイルやã€
+ ã»ã¨ã‚“ã©ä¸è¦ãªãƒ‘ッケージファイルã®ã¿ã‚’削除ã™ã‚‹ã“ã¨ã§ã™ã€‚
+ ã“ã®ãŸã‚ã€é•·ã„期間ã€ã‚­ãƒ£ãƒƒã‚·ãƒ¥ãŒç®¡ç†ã§ããšã«è‚¥å¤§åŒ–ã™ã‚‹ã“ã¨ãªãã€
+ 維æŒã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ 設定オプション <literal>APT::Clean-Installed</literal> ã«
+ off をセットã—ã¦ã„ã‚Œã°ã€
+ インストール済ã®ãƒ‘ッケージファイルãŒå‰Šé™¤ã•ã‚Œã‚‹ã®ã‚’防ã’ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term>
+<!--
+ <listitem><para>Download only; package files are only retrieved, not unpacked or installed.
+ Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem>
+-->
+ <listitem><para>ダウンロードã®ã¿ - パッケージファイルã®å–å¾—ã®ã¿ã‚’è¡Œã„ã€
+ 展開・インストールを行ã„ã¾ã›ã‚“。
+ 設定項目 - <literal>APT::Get::Download-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
+<!--
+ <listitem><para>Fix; attempt to correct a system with broken dependencies in
+ place. This option, when used with install/remove, can omit any packages
+ to permit APT to deduce a likely solution. Any Package that are specified
+ must completely correct the problem. The option is sometimes necessary when
+ running APT for the first time; APT itself does not allow broken package
+ dependencies to exist on a system. It is possible that a system's
+ dependency structure can be so corrupt as to require manual intervention
+ (which usually means using &dselect; or <command>dpkg -\-remove</command> to eliminate some of
+ the offending packages). Use of this option together with <option>-m</option> may produce an
+ error in some situations.
+ Configuration Item: <literal>APT::Get::Fix-Broken</literal>.</para></listitem>
+-->
+ <listitem><para>修復 - ä¾å­˜é–¢ä¿‚ãŒå£Šã‚ŒãŸã‚·ã‚¹ãƒ†ãƒ ã®ä¿®æ­£ã‚’試ã¿ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションを install ã‚„ remove ã¨ä¸€ç·’ã«ä½¿ã†ã¨ãã¯ã€
+ パッケージを指定ã—ãªãã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。
+ ã©ã®ãƒ‘ッケージを指定ã—ã¦ã‚‚ã€å®Œå…¨ã«å•é¡Œã‚’解決ã—ã¾ã™ã€‚APT 自体ã¯ã€
+ システムã«å­˜åœ¨ã™ã‚‹å£Šã‚ŒãŸãƒ‘ッケージä¾å­˜é–¢ä¿‚を許ã™ã“ã¨ãŒã§ããªã„ã®ã§ã€
+ åˆã‚㦠APT を実行ã™ã‚‹å ´åˆã€ã“ã®ã‚ªãƒ—ションãŒå¿…è¦ã«ãªã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚
+ システムã®ä¾å­˜é–¢ä¿‚構造ã«ã‹ãªã‚Šå•é¡ŒãŒã‚ã‚‹å ´åˆã¯ã€
+ 手動ã§ä¿®æ­£ã™ã‚‹ã‚ˆã†è¦æ±‚ã™ã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚
+ (通常ã¯ã€å•é¡Œã®ã‚るパッケージをå–り除ãã®ã« &dselect; ã‚„
+ <command>dpkg --remove</command> を使用ã—ã¾ã™)
+ ã“ã®ã‚ªãƒ—ションを <option>-m</option> オプションã¨åŒæ™‚ã«ä½¿ç”¨ã™ã‚‹ã¨ã€
+ エラーã«ãªã‚‹çŠ¶æ³ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+ 設定項目 - <literal>APT::Get::Fix-Broken</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-m</option></term><term><option>--ignore-missing</option></term>
+ <term><option>--fix-missing</option></term>
+<!--
+ <listitem><para>Ignore missing packages; If packages cannot be retrieved or fail the
+ integrity check after retrieval (corrupted package files), hold back
+ those packages and handle the result. Use of this option together with
+ <option>-f</option> may produce an error in some situations. If a package is
+ selected for installation (particularly if it is mentioned on the
+ command line) and it could not be downloaded then it will be silently
+ held back.
+ Configuration Item: <literal>APT::Get::Fix-Missing</literal>.</para></listitem>
+-->
+ <listitem><para>欠è½ãƒ‘ッケージã®ç„¡è¦– - パッケージãŒå–å¾—ã§ããªã‹ã£ãŸã‚Šã€
+ (パッケージã®ç ´æã§) å–å¾—ã—ãŸå¾Œã®æ•´åˆæ€§ãƒã‚§ãƒƒã‚¯ã‚’通らãªã‹ã£ãŸå ´åˆã€
+ ãã®ãƒ‘ッケージã®å‡¦ç†ã‚’ä¿ç•™ã—最後ã¾ã§å‡¦ç†ã‚’続ã‘ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションを <option>-f</option> オプションã¨åŒæ™‚ã«ä½¿ç”¨ã™ã‚‹ã¨ã€
+ エラーã«ãªã‚‹çŠ¶æ³ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+ パッケージをインストールã™ã‚‹ã‚ˆã†é¸æŠžã—ã¦ã„ã‚‹å ´åˆ
+ (特ã«ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ã®æ“作時) ã‚„ã€
+ ダウンロードã§ããªã‹ã£ãŸå ´åˆã«ã€ãªã«ã‚‚表示ã›ãšä¿ç•™ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Fix-Missing</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-download</option></term>
+<!--
+ <listitem><para>Disables downloading of packages. This is best used with
+ <option>-\-ignore-missing</option> to force APT to use only the .debs it has
+ already downloaded.
+ Configuration Item: <literal>APT::Get::Download</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’無効ã«ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã™ã§ã«ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—㟠.deb ã«å¯¾ã—ã¦ã®ã¿ APT ã‚’è¡Œã†å ´åˆã«ã€
+ <option>--ignore-missing</option> ã¨ä½µã›ã¦ä½¿ã†ã®ãŒã‚ˆã„ã§ã—ょã†ã€‚
+ 設定項目 - <literal>APT::Get::Download</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+ <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quiet up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quiet level, overriding the configuration file.
+ Note that quiet level 2 implies <option>-y</option>, you should never use -qq
+ without a no-action modifier such as -d, -\-print-uris or -s as APT may
+ decided to do something you did not expect.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ <listitem><para>é™ç²› - 進æ—表示をçœç•¥ã—ã€
+ ログをã¨ã‚‹ã®ã«ä¾¿åˆ©ãªå‡ºåŠ›ã‚’è¡Œã„ã¾ã™ã€‚
+ 最大 2 ã¤ã¾ã§ q ã‚’é‡ã­ã‚‹ã“ã¨ã§ã‚ˆã‚Šé™ç²›ã«ã§ãã¾ã™ã€‚
+ ã¾ãŸã€<option>-q=#</option> ã®ã‚ˆã†ã«é™ç²›ãƒ¬ãƒ™ãƒ«ã‚’指定ã—ã¦ã€
+ 設定ファイルを上書ãã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
+ é™ç²›ãƒ¬ãƒ™ãƒ« 2 㯠<option>-y</option> ã‚’å«ã‚“ã§ã„ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ APT ãŒæ„図ã—ãªã„決定を行ã†ã‹ã‚‚ã—ã‚Œãªã„ã®ã§ -d, --print-uris, -s ã®ã‚ˆã†ãª
+ æ“作を行ã‚ãªã„オプションをã¤ã‘ãšã« -qq を使用ã™ã‚‹ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term>
+ <term><option>--simulate</option></term>
+ <term><option>--just-print</option></term>
+ <term><option>--dry-run</option></term>
+ <term><option>--recon</option></term>
+ <term><option>--no-act</option></term>
+<!--
+ <listitem><para>No action; perform a simulation of events that would occur but do not
+ actually change the system.
+ Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
+-->
+ <listitem><para>動作ãªã— - ãªã«ãŒèµ·ã“ã‚‹ã®ã‹ã®ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã€
+ 実際ã«ã¯ã‚·ã‚¹ãƒ†ãƒ ã®å¤‰æ›´ã‚’è¡Œã„ã¾ã›ã‚“。
+ 設定項目 - <literal>APT::Get::Simulate</literal></para>
+
+<!--
+ <para>Simulate prints out
+ a series of lines each one representing a dpkg operation, Configure (Conf),
+ Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+ and empty set of square brackets meaning breaks that are of no consequence
+ (rare).</para></listitem>
+-->
+ <para>シミュレートã®çµæžœã€dpkg ã®å‹•ä½œã‚’表ã™ä¸€é€£ã®è¡Œã®ãã‚Œãžã‚Œã«ã€
+ 設定 (Conf)ã€å‰Šé™¤ (Remv)ã€å±•é–‹ (Inst) を表示ã—ã¾ã™ã€‚
+ 角カッコã¯å£Šã‚ŒãŸãƒ‘ッケージを表ã—ã€(ã¾ã‚Œã«)
+ 空ã®è§’カッコã¯å¤§ã—ãŸå•é¡Œã§ã¯ãªã„ã“ã¨ã‚’表ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-y</option></term><term><option>--yes</option></term>
+ <term><option>--assume-yes</option></term>
+<!--
+ <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run
+ non-interactively. If an undesirable situation, such as changing a held
+ package, trying to install a unauthenticated package or removing an essential package
+ occurs then <literal>apt-get</literal> will abort.
+ Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
+-->
+ <listitem><para>プロンプトã¸ã®è‡ªå‹•æ‰¿è«¾ - ã™ã¹ã¦ã®ãƒ—ロンプトã«è‡ªå‹•çš„ã«
+ "yes" ã¨ç­”ãˆã€éžå¯¾è©±çš„ã«å®Ÿè¡Œã—ã¾ã™ã€‚
+ ä¿ç•™ã—ãŸãƒ‘ッケージã®çŠ¶æ…‹ã‚’変更ã—ãŸã‚Šã€
+ 必須パッケージを削除ã™ã‚‹ã‚ˆã†ãªä¸é©åˆ‡ãªçŠ¶æ³ã®å ´åˆã€
+ <literal>apt-get</literal> ã¯å‡¦ç†ã‚’中断ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Assume-Yes</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
+<!--
+ <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
+ upgraded.
+ Configuration Item: <literal>APT::Get::Show-Upgraded</literal>.</para></listitem>
+-->
+ <listitem><para>更新パッケージ表示 -
+ æ›´æ–°ã•ã‚Œã‚‹å…¨ãƒ‘ッケージを一覧表示ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Show-Upgraded</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-V</option></term><term><option>--verbose-versions</option></term>
+<!--
+ <listitem><para>Show full versions for upgraded and installed packages.
+ Configuration Item: <literal>APT::Get::Show-Versions</literal>.</para></listitem>
+-->
+ <listitem><para>更新・インストールã™ã‚‹ãƒ‘ッケージã®ãƒ´ã‚¡ãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ã€
+ ã™ã¹ã¦è¡¨ç¤ºã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Show-Versions</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-b</option></term><term><option>--compile</option></term>
+ <term><option>--build</option></term>
+<!--
+ <listitem><para>Compile source packages after downloading them.
+ Configuration Item: <literal>APT::Get::Compile</literal>.</para></listitem>
+-->
+ <listitem><para>ソースパッケージをダウンロード後ã€ã‚³ãƒ³ãƒ‘イルã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Compile</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--ignore-hold</option></term>
+<!--
+ <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold
+ placed on a package. This may be useful in conjunction with
+ <literal>dist-upgrade</literal> to override a large number of undesired holds.
+ Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem>
+-->
+ <listitem><para>ä¿ç•™ãƒ‘ッケージã®ç„¡è¦– - パッケージã®ä¿ç•™æŒ‡ç¤ºã‚’無視ã—ã¦
+ <command>apt-get</command> ã‚’è¡Œã„ã¾ã™ã€‚
+ <literal>dist-upgrade</literal> ã¨å…±ã«ã€
+ 大é‡ã®ãƒ‘ッケージをä¿ç•™ã®è§£é™¤ã‚’ã™ã‚‹ã®ã«ä½¿ç”¨ã™ã‚‹ã¨ä¾¿åˆ©ã§ã™ã€‚
+ 設定項目 - <literal>APT::Ignore-Hold</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-upgrade</option></term>
+<!--
+ <listitem><para>Do not upgrade packages; When used in conjunction with <literal>install</literal>,
+ <literal>no-upgrade</literal> will prevent packages on the command line
+ from being upgraded if they are already installed.
+ Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージ更新ãªã— - <literal>install</literal>
+ ã¨åŒæ™‚ã«ä½¿ç”¨ã™ã‚‹ã¨ã€<literal>no-upgrade</literal> ã¯ã€
+ 指定ã—ãŸãƒ‘ッケージãŒã™ã§ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã‚ã‚‹å ´åˆã«æ›´æ–°ã‚’è¡Œã„ã¾ã›ã‚“。
+ 設定項目 - <literal>APT::Get::Upgrade</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--force-yes</option></term>
+<!--
+ <listitem><para>Force yes; This is a dangerous option that will cause apt to continue
+ without prompting if it is doing something potentially harmful. It
+ should not be used except in very special situations. Using
+ <literal>force-yes</literal> can potentially destroy your system!
+ Configuration Item: <literal>APT::Get::force-yes</literal>.</para></listitem>
+-->
+ <listitem><para>強制承諾 -
+ APT ãŒä½•ã‹æ傷を与ãˆã‹ã­ãªã„動作をã—よã†ã¨ã—ãŸå ´åˆã§ã‚‚ã€
+ 確èªã®å…¥åŠ›ãªã—ã§å®Ÿè¡Œã—ã¦ã—ã¾ã†å±é™ºãªã‚ªãƒ—ションã§ã™ã€‚
+ よã»ã©ã®çŠ¶æ³ã§ãªã‘ã‚Œã°ã€ä½¿ç”¨ã—ãªã„æ–¹ãŒã„ã„ã§ã—ょã†ã€‚
+ <literal>force-yes</literal> ã¯ã€ã‚ãªãŸã®ã‚·ã‚¹ãƒ†ãƒ ã‚’破壊ã—ã‹ã­ã¾ã›ã‚“!
+ 設定項目 - <literal>APT::Get::force-yes</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--print-uris</option></term>
+<!--
+ <listitem><para>Instead of fetching the files to install their URIs are printed. Each
+ URI will have the path, the destination file name, the size and the expected
+ md5 hash. Note that the file name to write to will not always match
+ the file name on the remote site! This also works with the
+ <literal>source</literal> and <literal>update</literal> commands. When used with the
+ <literal>update</literal> command the MD5 and size are not included, and it is
+ up to the user to decompress any compressed files.
+ Configuration Item: <literal>APT::Get::Print-URIs</literal>.</para></listitem>
+-->
+ <listitem><para>インストールã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—ã™ã‚‹ä»£ã‚ã‚Šã«ã€
+ ãã® URI を表示ã—ã¾ã™ã€‚
+ URI ã«ã¯ã€ãƒ‘スã€å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«åã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã€
+ 予測ã•ã‚Œã‚‹ md5 ãƒãƒƒã‚·ãƒ¥ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚
+ 出力ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«åãŒã€
+ 常ã«ãƒªãƒ¢ãƒ¼ãƒˆã‚µã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«åã¨ä¸€è‡´ã™ã‚‹ã‚ã‘ã§ã¯ãªã„ã€
+ ã¨ã„ã†ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„!
+ ã“れ㯠<literal>source</literal> コマンドã€
+ <literal>update</literal> コマンドã§ã‚‚動作ã—ã¾ã™ã€‚
+ <literal>update</literal> ã§ä½¿ç”¨ã—ãŸã¨ãã«ã¯ã€
+ MD5 やファイルサイズをå«ã¿ã¾ã›ã‚“。
+ ã“ã®ã¨ãã€åœ§ç¸®ãƒ•ã‚¡ã‚¤ãƒ«ã®å±•é–‹ã¯ãƒ¦ãƒ¼ã‚¶ã®è²¬ä»»ã«ãŠã„ã¦è¡Œã£ã¦ãã ã•ã„。
+ 設定項目 - <literal>APT::Get::Print-URIs</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--purge</option></term>
+<!--
+ <listitem><para>Use purge instead of remove for anything that would be removed.
+ An asterisk ("*") will be displayed next to packages which are
+ scheduled to be purged.
+ Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
+-->
+ <listitem><para>削除ã™ã‚‹éš›ã€ã€Œå‰Šé™¤ã€ã§ã¯ãªã「完全削除ã€ã‚’è¡Œã„ã¾ã™ã€‚
+ 「完全削除ã€ã‚’è¡Œã†ã¨æŒ‡ç¤ºã—ãŸãƒ‘ッケージåã®å¾Œã«ã¯ã€
+ アスタリスク ("*") ãŒä»˜ãã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Purge</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--reinstall</option></term>
+<!--
+ <listitem><para>Re-Install packages that are already installed and at the newest version.
+ Configuration Item: <literal>APT::Get::ReInstall</literal>.</para></listitem>
+-->
+ <listitem><para>ã™ã§ã«æœ€æ–°ç‰ˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¦ã‚‚ã€
+ パッケージをå†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::ReInstall</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--list-cleanup</option></term>
+<!--
+ <listitem><para>This option defaults to on, use <literal>-\-no-list-cleanup</literal> to turn it
+ off. When on <command>apt-get</command> will automatically manage the contents of
+ <filename>&statedir;/lists</filename> to ensure that obsolete files are erased.
+ The only reason to turn it off is if you frequently change your source
+ list.
+ Configuration Item: <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+-->
+ <listitem><para>ã“ã®æ©Ÿèƒ½ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ ON ã«ãªã£ã¦ã„ã¾ã™ã€‚
+ OFF ã«ã™ã‚‹ã«ã¯ <literal>--no-list-cleanup</literal> ã¨ã—ã¦ãã ã•ã„。
+ ON ã®å ´åˆã€
+ <command>apt-get</command> ã¯å¤ããªã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’確実ã«æ¶ˆåŽ»ã™ã‚‹ãŸã‚ã€
+ 自動的㫠<filename>&statedir;/lists</filename> ã®ä¸­èº«ã‚’管ç†ã—ã¾ã™ã€‚
+ ã“れを OFF ã«ã™ã‚‹ã®ã¯ã€å–得元リストを頻ç¹ã«å¤‰æ›´ã™ã‚‹æ™‚ãらã„ã§ã—ょã†ã€‚
+ 設定項目 - <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-t</option></term>
+ <term><option>--target-release</option></term>
+ <term><option>--default-release</option></term>
+<!--
+ <listitem><para>This option controls the default input to the policy engine, it creates
+ a default pin at priority 990 using the specified release string. The
+ preferences file may further override this setting. In short, this option
+ lets you have simple control over which distribution packages will be
+ retrieved from. Some common examples might be
+ <option>-t '2.1*'</option> or <option>-t unstable</option>.
+ Configuration Item: <literal>APT::Default-Release</literal>;
+ see also the &apt-preferences; manual page.</para></listitem>
+-->
+ <listitem><para>ã“ã®ã‚ªãƒ—ションã¯ã€
+ ãƒãƒªã‚·ãƒ¼ã‚¨ãƒ³ã‚¸ãƒ³ã¸ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå…¥åŠ›ã‚’制御ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€æŒ‡å®šã•ã‚ŒãŸãƒªãƒªãƒ¼ã‚¹æ–‡å­—列を使用ã—ã€
+ デフォルト pin を優先度 990 ã§ä½œæˆã™ã‚‹ã“ã¨ã§ã™ã€‚
+ 優先ファイルã¯ã“ã®è¨­å®šã‚’上書ãã—ã¾ã™ã€‚
+ è¦ã™ã‚‹ã«ã“ã®ã‚ªãƒ—ションã§ã€
+ ã©ã®é…布パッケージをå–å¾—ã™ã‚‹ã‹ã‚’ç°¡å˜ã«ç®¡ç†ã—ã¾ã™ã€‚
+ 一般的ãªä¾‹ã¨ã—ã¦ã¯ã€
+ <option>-t '2.1*'</option> ã‚„ <option>-t unstable</option> ã§ã—ょã†ã€‚
+ 設定項目 - <literal>APT::Default-Release</literal>
+ &apt-preferences; ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚‚ã”覧ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--trivial-only</option></term>
+<!--
+ <listitem><para>
+ Only perform operations that are 'trivial'. Logically this can be considered
+ related to <option>-\-assume-yes</option>, where <option>-\-assume-yes</option> will answer
+ yes to any prompt, <option>-\-trivial-only</option> will answer no.
+ Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
+-->
+ <listitem><para>
+ 「é‡è¦ã§ãªã„ã€æ“作ã®ã¿ã‚’è¡Œã„ã¾ã™ã€‚
+ ã“ã‚Œã¯è«–ç†çš„ã« <option>--assume-yes</option> ã®ä»²é–“ã¨è¦‹ãªã›ã¾ã™ã€‚
+ <option>--assume-yes</option> ã¯è³ªå•ã«ã™ã¹ã¦ yes ã¨ç­”ãˆã¾ã™ãŒã€
+ <option>--trivial-only</option> ã¯ã™ã¹ã¦ no ã¨ç­”ãˆã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Trivial-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-remove</option></term>
+<!--
+ <listitem><para>If any packages are to be removed apt-get immediately aborts without
+ prompting.
+ Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージãŒå‰Šé™¤ã•ã‚Œã‚‹çŠ¶æ³ã«ãªã£ãŸã¨ãã€
+ プロンプトを表示ã›ãšä¸­æ–­ã—ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Remove</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--only-source</option></term>
+ <!--
+ <listitem><para>Only has meaning for the
+ <literal>source</literal> and <literal>build-dep</literal>
+ commands. Indicates that the given source names are not to be
+ mapped through the binary table. This means that if this option
+ is specified, these commands will only accept source package
+ names as arguments, rather than accepting binary package names
+ and looking up the corresponding source package. Configuration
+ Item: <literal>APT::Get::Only-Source</literal>.</para></listitem>
+-->
+ <listitem><para><literal>source</literal> コマンドã¨
+ <literal>build-dep</literal> コマンドã§ã®ã¿æ„味ãŒã‚ã‚Šã¾ã™ã€‚
+ 指定ã•ã‚ŒãŸã‚½ãƒ¼ã‚¹åãŒãƒã‚¤ãƒŠãƒªãƒ†ãƒ¼ãƒ–ルã«ãƒžãƒƒãƒ—ã•ã‚Œãªã„よã†ã«ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€ã“ã®ã‚ªãƒ—ションを指定ã™ã‚‹ã¨ã€
+ ãƒã‚¤ãƒŠãƒªãƒ‘ッケージåã‚’å—ã‘付ã‘ã¦å¯¾å¿œã™ã‚‹ã‚½ãƒ¼ã‚¹ãƒ‘ッケージを探ã™ã®ã§ã¯ãªãã€
+ 引数ã«ã‚½ãƒ¼ã‚¹ãƒ‘ッケージåã—ã‹å—ã‘付ã‘ãªããªã‚‹ã€ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+ 設定項目 - <literal>APT::Get::Only-Source</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term>
+<!--
+ <listitem><para>Download only the diff or tar file of a source archive.
+ Configuration Item: <literal>APT::Get::Diff-Only</literal> and
+ <literal>APT::Get::Tar-Only</literal>.</para></listitem>
+-->
+ <listitem><para>ソースアーカイブ㮠diff ファイルや
+ tar ファイルã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã®ã¿ã‚’è¡Œã„ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Diff-Only</literal>,
+ <literal>APT::Get::Tar-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--arch-only</option></term>
+<!--
+ <listitem><para>Only process architecture-dependent build-dependencies.
+ Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem>
+-->
+ <listitem><para>構築ä¾å­˜é–¢ä¿‚ã®è§£æ±ºã‚’ã€
+ アーキテクãƒãƒ£ã«ä¾å­˜ã—ãŸã‚‚ã®ã®ã¿è¡Œã„ã¾ã™ã€‚
+ 設定項目 - <literal>APT::Get::Arch-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--allow-unauthenticated</option></term>
+<!--
+ <listitem><para>Ignore if packages can't be authenticated and don't prompt about it.
+ This is usefull for tools like pbuilder.
+ Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージを確èªã§ããªã„å ´åˆã«ç„¡è¦–ã—ã€
+ ãã‚Œã«ã¤ã„ã¦è³ªå•ã—ã¾ã›ã‚“。
+ pbuilder ã®ã‚ˆã†ãªãƒ„ールã§ä¾¿åˆ©ã§ã™ã€‚
+ 設定項目 - <literal>APT::Get::AllowUnauthenticated</literal></para></listitem>
+ </varlistentry>
+
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+ <listitem><para>Locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージã®å–得元。
+ 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
+<!--
+ <listitem><para>APT configuration file.
+ Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
+-->
+ <listitem><para>APT 設定ファイル。
+ 設定項目 - <literal>Dir::Etc::Main</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
+<!--
+ <listitem><para>APT configuration file fragments
+ Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
+-->
+ <listitem><para>APT 設定ファイルã®æ–­ç‰‡ã€‚
+ 設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/preferences</filename></term>
+<!--
+ <listitem><para>Version preferences file.
+ This is where you would specify "pinning",
+ i.e. a preference to get certain packages
+ from a separate source
+ or from a different version of a distribution.
+ Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>
+-->
+ <listitem><para>ãƒãƒ¼ã‚¸ãƒ§ãƒ³å„ªå…ˆãƒ•ã‚¡ã‚¤ãƒ«ã€‚
+ ã“ã“ã« "pin" ã®è¨­å®šã‚’è¡Œã„ã¾ã™ã€‚
+ ã¤ã¾ã‚Šã€åˆ¥ã€…ã®å–得元や異ãªã‚‹ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã€
+ ã©ã“ã‹ã‚‰ãƒ‘ッケージをå–å¾—ã™ã‚‹ã‹ã‚’設定ã—ã¾ã™ã€‚
+ 設定項目 - <literal>Dir::Etc::Preferences</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&cachedir;/archives/</filename></term>
+<!--
+ <listitem><para>Storage area for retrieved package files.
+ Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
+-->
+ <listitem><para>å–得済ã¿ãƒ‘ッケージファイル格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
+<!--
+ <listitem><para>Storage area for package files in transit.
+ Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
+-->
+ <listitem><para>å–得中パッケージファイル格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::Cache::Archives</literal> (必然的ã«ä¸å®Œå…¨)</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+ <listitem><para>Storage area for state information for each package resource specified in
+ &sources-list;
+ Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+ <listitem><para>&sources-list; ã®ãƒ‘ッケージリソース特有ã®çŠ¶æ…‹æƒ…報格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+ <listitem><para> Storage area for state information in transit.
+ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+ <listitem><para>å–得中ã®çŠ¶æ…‹æƒ…報格ç´ã‚¨ãƒªã‚¢ã€‚
+ 設定項目 - <literal>Dir::State::Lists</literal> (必然的ã«ä¸å®Œå…¨)</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+<!--
+ <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+ &apt-conf;, &apt-config;,
+ The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para>
+-->
+ <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+ &apt-conf;, &apt-config;,
+ &docdir; 㮠APT ユーザーズガイド, &apt-preferences;, APT Howto</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+ <para><command>apt-get</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-key.ja.8.xml b/doc/ja/apt-key.ja.8.xml
new file mode 100644
index 000000000..732ca9b1c
--- /dev/null
+++ b/doc/ja/apt-key.ja.8.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+
+ <refmeta>
+ <refentrytitle>apt-key</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-key</refname>
+<!--
+ <refpurpose>APT key management utility</refpurpose>
+-->
+ <refpurpose>APT キー管ç†ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-key</command>
+ <arg><replaceable>command</replaceable>/</arg>
+ <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+ <para>
+<!--
+ <command>apt-key</command> is used to manage the list of keys used
+ by apt to authenticate packages. Packages which have been
+ authenticated using these keys will be considered trusted.
+-->
+ <command>apt-key</command> ã¯ã€
+ apt ㌠パッケージをèªè¨¼ã™ã‚‹ã®ã«ä½¿ç”¨ã™ã‚‹ã‚­ãƒ¼ã®ä¸€è¦§ã‚’管ç†ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚
+ ã“ã®ã‚­ãƒ¼ã§èªè¨¼ã•ã‚ŒãŸãƒ‘ッケージã¯ã€ä¿¡é ¼ã™ã‚‹ã«è¶³ã‚‹ã¨è¦‹ãªã›ã‚‹ã§ã—ょã†ã€‚
+ </para>
+</refsect1>
+
+<!--
+<refsect1><title>Commands</title>
+-->
+<refsect1><title>コマンド</title>
+ <variablelist>
+ <varlistentry><term>add <replaceable>filename</replaceable></term>
+ <listitem>
+ <para>
+
+<!--
+ Add a new key to the list of trusted keys. The key is read
+ from <replaceable>filename</replaceable>, or standard input if
+ <replaceable>filename</replaceable> is <literal>-</literal>.
+-->
+ 信頼キー一覧ã«æ–°ã—ã„キーを追加ã—ã¾ã™ã€‚
+ ã“ã®ã‚­ãƒ¼ã¯ <replaceable>filename</replaceable> ã‹ã‚‰èª­ã¿è¾¼ã¿ã¾ã™ãŒã€
+ <replaceable>filename</replaceable> ã‚’ <literal>-</literal> ã¨ã™ã‚‹ã¨ã€
+ 標準入力ã‹ã‚‰èª­ã¿è¾¼ã¿ã¾ã™ã€‚
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>del <replaceable>keyid</replaceable></term>
+ <listitem>
+ <para>
+
+<!--
+ Remove a key from the list of trusted keys.
+-->
+ 信頼キー一覧ã‹ã‚‰ã‚­ãƒ¼ã‚’削除ã—ã¾ã™ã€‚
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>list</term>
+ <listitem>
+ <para>
+
+<!--
+ List trusted keys.
+-->
+ 信頼キーを一覧表示ã—ã¾ã™ã€‚
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>update</term>
+ <listitem>
+ <para>
+
+<!--
+ Update the local keyring with the keyring of Debian archive
+ keys and removes from the keyring the archive keys which are no
+ longer valid.
+-->
+ Debian アーカイブキーã§ã€ãƒ­ãƒ¼ã‚«ãƒ«ã‚­ãƒ¼ãƒªãƒ³ã‚°ã‚’æ›´æ–°ã—ã€
+ ã‚‚ã†æœ‰åŠ¹ã§ãªã„キーをキーリングã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
+-->
+ <listitem><para>ローカル信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã€‚
+ æ–°ã—ã„キーã¯ã“ã“ã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
+<!--
+ <listitem><para>Local trust database of archive keys.</para></listitem>
+-->
+ <listitem><para>アーカイブキーã®ãƒ­ãƒ¼ã‚«ãƒ«ä¿¡é ¼ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+-->
+ <listitem><para>Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+-->
+ <listitem><para>削除ã•ã‚ŒãŸ Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°</para></listitem>
+ </varlistentry>
+
+
+
+ </variablelist>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title>
+-->
+<refsect1><title>関連項目</title>
+<para>
+&apt-get;, &apt-secure;
+</para>
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
new file mode 100644
index 000000000..5b9612a7f
--- /dev/null
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+
+ <refmeta>
+ <refentrytitle>apt-secure</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+<!-- NOTE: This manpage has been written based on the
+ Securing Debian Manual ("Debian Security
+ Infrastructure" chapter) and on documentation
+ available at the following sites:
+ http://wiki.debian.net/?apt06
+ http://www.syntaxpolice.org/apt-secure/
+ http://www.enyo.de/fw/software/apt-secure/
+-->
+<!-- TODO: write a more verbose example of how it works with
+ a sample similar to
+ http://www.debian-administration.org/articles/174
+ ?
+-->
+
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-secure</refname>
+<!--
+ <refpurpose>Archive authentication support for APT</refpurpose>
+-->
+ <refpurpose>APT アーカイブèªè¨¼ã‚µãƒãƒ¼ãƒˆ</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+ <para>
+<!--
+ Starting with version 0.6, <command>apt</command> contains code
+ that does signature checking of the Release file for all
+ archives. This ensures that packages in the archive can't be
+ modified by people who have no access to the Release file signing
+ key.
+-->
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 0.6 よりã€<command>apt</command> 全アーカイブã«å¯¾ã™ã‚‹
+ Release ファイルã®ç½²åãƒã‚§ãƒƒã‚¯ã‚³ãƒ¼ãƒ‰ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚
+ Release ファイル署åキーã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„人ãŒã€
+ アーカイブã®ãƒ‘ッケージã®å¤‰æ›´ãŒç¢ºå®Ÿã«ã§ããªã„よã†ã«ã—ã¾ã™ã€‚
+ </para>
+
+ <para>
+<!--
+ If a package comes from a archive without a signature or with a
+ signature that apt does not have a key for that package is
+ considered untrusted and installing it will result in a big
+ warning. <command>apt-get</command> will currently only warn
+ for unsigned archives, future releases might force all sources
+ to be verified before downloading packages from them.
+-->
+ パッケージã«ç½²åã•ã‚Œãªã‹ã£ãŸã‚Šã€apt ãŒçŸ¥ã‚‰ãªã„キーã§ç½²åã•ã‚Œã¦ã„ãŸå ´åˆã€
+ アーカイブã‹ã‚‰æ¥ãŸãƒ‘ッケージã¯ã€ä¿¡é ¼ã•ã‚Œã¦ã„ãªã„ã¨è¦‹ãªã—ã€
+ インストールã®éš›ã«é‡è¦ãªè­¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
+ <command>apt-get</command> ã¯ã€
+ ç¾åœ¨æœªç½²åã®ãƒ‘ッケージã«å¯¾ã—ã¦è­¦å‘Šã™ã‚‹ã ã‘ã§ã™ãŒã€
+ å°†æ¥ã®ãƒªãƒªãƒ¼ã‚¹ã§ã¯ã€å…¨ã‚½ãƒ¼ã‚¹ã«å¯¾ã—ã€
+ パッケージダウンロードå‰ã«å¼·åˆ¶çš„ã«æ¤œè¨¼ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ </para>
+
+ <para>
+<!--
+ The package frontends &apt-get;, &aptitude; and &synaptic; support this new
+ authentication feature.
+-->
+ &apt-get;, &aptitude;, &synaptic; ã¨ã„ã£ãŸãƒ‘ッケージフロントエンドã¯ã€
+ ã“ã®æ–°èªè¨¼æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚
+ </para>
+</refsect1>
+
+<!--
+ <refsect1><title>Trusted archives</title>
+-->
+ <refsect1><title>信頼済アーカイブ</title>
+
+ <para>
+<!--
+ The chain of trust from an apt archive to the end user is made up of
+ different steps. <command>apt-secure</command> is the last step in
+ this chain, trusting an archive does not mean that the packages
+ that you trust it do not contain malicious code but means that you
+ trust the archive maintainer. Its the archive maintainer
+ responsibility to ensure that the archive integrity is correct.
+-->
+ apt アーカイブã‹ã‚‰ã‚¨ãƒ³ãƒ‰ãƒ¦ãƒ¼ã‚¶ã¾ã§ã®ä¿¡é ¼ã®è¼ªã¯ã€
+ ã„ãã¤ã‹ã®ã‚¹ãƒ†ãƒƒãƒ—ã§æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+ <command>apt-secure</command> ã¯ã€ã“ã®è¼ªã®æœ€å¾Œã®ã‚¹ãƒ†ãƒƒãƒ—ã§ã€
+ アーカイブを信頼ã™ã‚‹ã“ã¨ã¯ã€
+ パッケージã«æ‚ªæ„ã®ã‚るコードãŒå«ã¾ã‚Œã¦ã„ãªã„ã¨ä¿¡é ¼ã™ã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€
+ アーカイブメンテナを信頼ã™ã‚‹ã¨è¨€ã†ã“ã¨ã§ã™ã€‚
+ ã“ã‚Œã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®å®Œå…¨æ€§ã‚’ä¿è¨¼ã™ã‚‹ã®ã¯ã€
+ アーカイブメンテナã®è²¬ä»»ã ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+ </para>
+
+<!--
+ <para>apt-secure does not review signatures at a
+ package level. If you require tools to do this you should look at
+ <command>debsig-verify</command> and
+ <command>debsign</command> (provided in the debsig-verify and
+ devscripts packages respectively).</para>
+-->
+ <para>apt-secure ã¯ãƒ‘ッケージレベルã®ç½²å検証ã¯è¡Œã„ã¾ã›ã‚“。
+ ãã®ã‚ˆã†ãªãƒ„ールãŒå¿…è¦ãªå ´åˆã¯ã€
+ <command>debsig-verify</command> ã‚„ <command>debsign</command>
+ (debsig-verify パッケージ㨠devscripts パッケージã§ãã‚Œãžã‚Œæä¾›ã•ã‚Œã¦ã„ã¾ã™)
+ を確èªã—ã¦ãã ã•ã„。</para>
+
+ <para>
+<!--
+ The chain of trust in Debian starts when a maintainer uploads a new
+ package or a new version of a package to the Debian archive. This
+ upload in order to become effective needs to be signed by a key of
+ a maintainer within the Debian maintainer's keyring (available in
+ the debian-keyring package). Maintainer's keys are signed by
+ other maintainers following pre-established procedures to
+ ensure the identity of the key holder.
+-->
+ Debian ã«ãŠã‘ã‚‹ä¿¡é ¼ã®è¼ªã¯ã€
+ æ–°ã—ã„パッケージやパッケージã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ã€
+ メンテナ㌠Debian アーカイブã«ã‚¢ãƒƒãƒ—ロードã™ã‚‹ã“ã¨ã§å§‹ã¾ã‚Šã¾ã™ã€‚
+ ã“ã‚Œã¯ã€Debian メンテナキーリング (debian-keyring パッケージã«ã‚ã‚Šã¾ã™)
+ ã«ã‚るメンテナã®ã‚­ãƒ¼ã§ç½²åã—ãªã‘ã‚Œã°ã€ã‚¢ãƒƒãƒ—ロードã§ããªã„ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+ メンテナã®ã‚­ãƒ¼ã¯ã€ã‚­ãƒ¼ã®æ‰€æœ‰è€…ã®ã‚¢ã‚¤ãƒ‡ãƒ³ãƒ†ã‚£ãƒ†ã‚£ã‚’確ä¿ã™ã‚‹ãŸã‚ã€
+ 以下ã®ã‚ˆã†ãªäº‹å‰ã«ç¢ºç«‹ã—ãŸæ‰‹æ®µã§ã€ä»–ã®ãƒ¡ãƒ³ãƒ†ãƒŠã«ç½²åã•ã‚Œã¦ã„ã¾ã™ã€‚
+ </para>
+
+ <para>
+<!--
+ Once the uploaded package is verified and included in the archive,
+ the maintainer signature is stripped off, an MD5 sum of the package
+ is computed and put in the Packages file. The MD5 sum of all of the
+ packages files are then computed and put into the Release file. The
+ Release file is then signed by the archive key (which is created
+ once a year and distributed through the FTP server. This key is
+ also on the Debian keyring.
+-->
+ アップロードã•ã‚ŒãŸãƒ‘ッケージã”ã¨ã«ã€æ¤œè¨¼ã—ã¦ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã«æ ¼ç´ã—ã¾ã™ã€‚
+ パッケージã¯ã€ãƒ¡ãƒ³ãƒ†ãƒŠã®ç½²åã‚’ã¯ãŒã•ã‚Œã€ MD5 sum を計算ã•ã‚Œã¦ã€
+ Packages ファイルã«æ ¼ç´ã•ã‚Œã¾ã™ã€‚
+ ãã®å¾Œã€å…¨ãƒ‘ッケージファイル㮠MD5 sum を計算ã—ã¦ã‹ã‚‰ã€
+ Release ファイルã«ç½®ãã¾ã™ã€‚
+ Release ファイルã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–キーã§ç½²åã•ã‚Œã¾ã™ã€‚
+ アーカイブキーã¯å¹´ã”ã¨ã«ä½œæˆã•ã‚Œã€FTP サーãƒã§é…布ã•ã‚Œã¾ã™ã€‚
+ ã“ã®ã‚­ãƒ¼ã‚‚ Debian キーリングã«å«ã¾ã‚Œã¾ã™ã€‚
+ </para>
+
+ <para>
+<!--
+ Any end user can check the signature of the Release file, extract the MD5
+ sum of a package from it and compare it with the MD5 sum of the
+ package he downloaded. Prior to version 0.6 only the MD5 sum of the
+ downloaded Debian package was checked. Now both the MD5 sum and the
+ signature of the Release file are checked.
+-->
+ エンドユーザã¯èª°ã§ã‚‚ã€Release ファイルã®ç½²åã‚’ãƒã‚§ãƒƒã‚¯ã—ã€
+ パッケージ㮠MD5 sum を抽出ã—ã¦ã€ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ‘ッケージ㮠MD5 sum
+ ã¨æ¯”較ã§ãã¾ã™ã€‚
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 0.6 以å‰ã§ã¯ã€ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—㟠Debian パッケージ㮠MD5 sum ã—ã‹ã€
+ ãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã›ã‚“ã§ã—ãŸã€‚
+ ç¾åœ¨ã§ã¯ã€MD5 sum 㨠Release ファイルã®ç½²åã®ä¸¡æ–¹ã§ãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã€‚
+ </para>
+
+<!--
+ <para>Notice that this is distinct from checking signatures on a
+ per package basis. It is designed to prevent two possible attacks:
+-->
+ <para>以上ã¯ã€ãƒ‘ッケージã”ã¨ã®ç½²åãƒã‚§ãƒƒã‚¯ã¨ã¯é•ã†ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ 以下ã®ã‚ˆã†ã«è€ƒãˆã‚‰ã‚Œã‚‹ 2 種類ã®æ”»æ’ƒã‚’防ãよã†è¨­è¨ˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+ </para>
+
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Network "man in the middle"
+ attacks</literal>. Without signature checking, a malicious
+ agent can introduce himself in the package download process and
+ provide malicious software either by controlling a network
+ element (router, switch, etc.) or by redirecting traffic to a
+ rogue server (through arp or DNS spoofing
+ attacks).</para></listitem>
+-->
+ <listitem><para><literal>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ä¸­é–“者攻撃</literal>
+ ç½²åã‚’ãƒã‚§ãƒƒã‚¯ã—ãªã„ã¨ã€
+ 悪æ„ã‚るエージェントãŒãƒ‘ッケージダウンロードプロセスã«å‰²ã‚Šè¾¼ã‚“ã ã‚Šã€
+ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ§‹æˆè¦ç´  (ルータã€ã‚¹ã‚¤ãƒƒãƒãªã©) ã®åˆ¶å¾¡ã‚„ã€
+ 悪漢サーãƒã¸ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãªã©
+ (arp 経由や DNS スプーフィング攻撃) ã§ã€
+ 悪æ„ã‚るソフトウェアを掴ã¾ã•ã‚ŒãŸã‚Šã—ã¾ã™ã€‚</para></listitem>
+
+<!--
+ <listitem><para><literal>Mirror network compromise</literal>.
+ Without signature checking, a malicious agent can compromise a
+ mirror host and modify the files in it to propagate malicious
+ software to all users downloading packages from that
+ host.</para></listitem>
+-->
+ <listitem><para><literal>ミラーãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ„ŸæŸ“</literal>.
+ ç½²åã‚’ãƒã‚§ãƒƒã‚¯ã—ãªã„ã¨ã€æ‚ªæ„ã‚るエージェントãŒãƒŸãƒ©ãƒ¼ãƒ›ã‚¹ãƒˆã«æ„ŸæŸ“ã—ã€
+ ã“ã®ãƒ›ã‚¹ãƒˆã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ¦ãƒ¼ã‚¶ã™ã¹ã¦ã«ã€
+ 悪æ„ã‚るソフトウェアãŒä¼æ’­ã™ã‚‹ã‚ˆã†ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’変更ã§ãã¾ã™ã€‚</para></listitem>
+ </itemizedlist>
+
+<!--
+ <para>However, it does not defend against a compromise of the
+ Debian master server itself (which signs the packages) or against a
+ compromise of the key used to sign the Release files. In any case,
+ this mechanism can complement a per-package signature.</para>
+-->
+ <para>ã—ã‹ã—ã“ã‚Œã¯ã€
+ (パッケージã«ç½²åã™ã‚‹) Debian マスターサーãƒè‡ªä½“ã®æ„ŸæŸ“ã‚„ã€
+ Release ファイルã«ç½²åã™ã‚‹ã®ã«ä½¿ç”¨ã—ãŸã‚­ãƒ¼ã®æ„ŸæŸ“を防ã’ã¾ã›ã‚“。
+ ã„ãšã‚Œã«ã›ã‚ˆã€ã“ã®æ©Ÿæ§‹ã¯ãƒ‘ッケージã”ã¨ã®ç½²åを補完ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</para>
+</refsect1>
+
+<!--
+ <refsect1><title>User configuration</title>
+-->
+ <refsect1><title>ユーザã®è¨­å®š</title>
+ <para>
+<!--
+ <command>apt-key</command> is the program that manages the list
+ of keys used by apt. It can be used to add or remove keys although
+ an installation of this release will automatically provide the
+ default Debian archive signing keys used in the Debian package
+ repositories.
+-->
+ <command>apt-key</command> ã¯ã€
+ apt ãŒä½¿ç”¨ã™ã‚‹ã‚­ãƒ¼ãƒªã‚¹ãƒˆã‚’管ç†ã™ã‚‹ãƒ—ログラムã§ã™ã€‚
+ ã“ã®ãƒªãƒªãƒ¼ã‚¹ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ã¯ã€Debian パッケージリãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã™ã‚‹ã€
+ キーã§ç½²åã™ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® Debian アーカイブをæä¾›ã—ã¾ã™ãŒã€
+ <command>apt-key</command> ã§ã‚­ãƒ¼ã®è¿½åŠ ãƒ»å‰Šé™¤ãŒè¡Œãˆã¾ã™ã€‚
+ </para>
+ <para>
+<!--
+ In order to add a new key you need to first download it
+ (you should make sure you are using a trusted communication channel
+ when retrieving it), add it with <command>apt-key</command> and
+ then run <command>apt-get update</command> so that apt can download
+ and verify the <filename>Release.gpg</filename> files from the archives you
+ have configured.
+-->
+ æ–°ã—ã„キーを追加ã™ã‚‹ãŸã‚ã«ã¯ã€ã¾ãšã‚­ãƒ¼ã‚’ダウンロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ (å–å¾—ã™ã‚‹éš›ã«ã¯ã€ä¿¡é ¼ã§ãる通信ãƒãƒ£ãƒãƒ«ã‚’使用ã™ã‚‹ã‚ˆã†ã€ç‰¹ã«ç•™æ„ã—ã¦ãã ã•ã„)
+ å–å¾—ã—ãŸã‚­ãƒ¼ã‚’ã€<command>apt-key</command> ã§è¿½åŠ ã—ã€
+ <command>apt-get update</command> を実行ã—ã¦ãã ã•ã„。
+ 以上ã«ã‚ˆã‚Šã€apt ã¯æŒ‡å®šã—ãŸã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‹ã‚‰ã€<filename>Release.gpg</filename>
+ ファイルをダウンロード・検証ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
+ </para>
+</refsect1>
+
+<!--
+<refsect1><title>Archive configuration</title>
+-->
+<refsect1><title>アーカイブã®è¨­å®š</title>
+ <para>
+<!--
+ If you want to provide archive signatures in an archive under your
+ maintenance you have to:
+-->
+ ã‚ãªãŸãŒãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã—ã¦ã„るアーカイブã§ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ç½²åã‚’æä¾›ã—ãŸã„å ´åˆã€
+ 以下ã®ã‚ˆã†ã«ã—ã¦ãã ã•ã„。
+ </para>
+
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Create a toplevel Release
+ file</literal>. if it does not exist already. You can do this
+ by running <command>apt-ftparchive release</command>
+ (provided inftp apt-utils).</para></listitem>
+-->
+ <listitem><para><literal>ä¸Šä½ Release ファイルã®ä½œæˆ</literal>
+ æ—¢ã«ã“ã‚ŒãŒå­˜åœ¨ã—ã¦ã„ã‚‹ã®ã§ãªã‘ã‚Œã°ã€
+ <command>apt-ftparchive release</command> (apt-utils ã§æä¾›)
+ を実行ã—ã¦ä½œæˆã—ã¦ãã ã•ã„。</para></listitem>
+
+<!--
+ <listitem><para><literal>Sign it</literal>. You can do this by running
+ <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
+-->
+ <listitem><para><literal>ç½²å</literal>
+ <command>gpg -abs -o Release.gpg Release</command> を実行ã—ã¦ã€
+ ç½²åã—ã¦ãã ã•ã„。</para></listitem>
+
+<!--
+ <listitem><para><literal>Publish the key fingerprint</literal>,
+ that way your users will know what key they need to import in
+ order to authenticate the files in the
+ archive.</para></listitem>
+-->
+ <listitem><para><literal>キーã®æŒ‡ç´‹ã‚’é…布</literal>
+ ã“ã‚Œã«ã‚ˆã‚Šã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–内ã®ãƒ•ã‚¡ã‚¤ãƒ«èªè¨¼ã«ã€
+ ã©ã®ã‚­ãƒ¼ã‚’インãƒãƒ¼ãƒˆã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚’ã€
+ ユーザã«çŸ¥ã‚‰ã›ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚</para></listitem>
+
+ </itemizedlist>
+
+<!--
+ <para>Whenever the contents of the archive changes (new packages
+ are added or removed) the archive maintainer has to follow the
+ first two steps previously outlined.</para>
+-->
+ <para>アーカイブã®å†…容ã«å¤‰åŒ–ãŒã‚ã‚‹å ´åˆ (æ–°ã—ã„パッケージã®è¿½åŠ ã‚„削除)ã€
+ アーカイブメンテナã¯å‰è¿°ã®æœ€åˆã® 1, 2 ステップã«å¾“ã‚ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。</para>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title>
+-->
+<refsect1><title>関連項目</title>
+<para>
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&debsign; &debsig-verify;, &gpg;
+</para>
+
+<!--
+<para>For more backgound information you might want to review the
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> chapter of the Securing Debian Manual
+(available also in the harden-doc package) and the
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> by V. Alex Brennen. </para>
+-->
+<para>詳細ãªèƒŒæ™¯æƒ…報を検証ã™ã‚‹ã®ãªã‚‰ã€
+the Securing Debian Manual (harden-doc パッケージã«ã‚‚ã‚ã‚Šã¾ã™) ã®
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> ç« ã¨ã€
+V. Alex Brennen ã«ã‚ˆã‚‹
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> ã‚’ã”覧ãã ã•ã„。</para>
+
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+
+<!--
+<refsect1><title>Manpage Authors</title>
+-->
+<refsect1><title>マニュアルページ筆者</title>
+
+<!--
+<para>This man-page is based on the work of Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt.
+-->
+<para>ã“ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã¯ Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt
+ã®ä½œæ¥­ã‚’å…ƒã«ã—ã¦ã„ã¾ã™ã€‚
+</para>
+
+</refsect1>
+
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-sortpkgs.ja.1.xml b/doc/ja/apt-sortpkgs.ja.1.xml
new file mode 100644
index 000000000..779620f0b
--- /dev/null
+++ b/doc/ja/apt-sortpkgs.ja.1.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-sortpkgs</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-sortpkgs</refname>
+<!--
+ <refpurpose>Utility to sort package index files</refpurpose>
+-->
+ <refpurpose>パッケージインデックスファイルã®ã‚½ãƒ¼ãƒˆãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£</refpurpose>
+
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-sortpkgs</command>
+ <arg><option>-hvs</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-sortpkgs</command> will take an index file (Source index or Package
+ index) and sort the records so that they are ordered by the package name.
+ It will also sort the internal fields of each record according to the
+ internal sorting rules.</para>
+-->
+ <para><command>apt-sortpkgs</command> ã¯ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«
+ (ソースインデックスやパッケージインデックス) ã‹ã‚‰ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’ソートã—ã€
+ パッケージåé †ã«æ•´ãˆã¾ã™ã€‚
+ ã¾ãŸã€å†…部ã®ã‚½ãƒ¼ãƒˆè¦å‰‡ã«å¾“ã£ã¦ã€å†…部フィールドã«ã¤ã„ã¦ã‚‚ソートを行ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>
+ All output is sent to stdout, the input must be a seekable file.</para>
+-->
+ <para>
+ 出力ã¯ã™ã¹ã¦æ¨™æº–出力ã«é€ã‚‰ã‚Œã€å…¥åŠ›ã¯æ¤œç´¢ã§ãるファイルã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-s</option></term><term><option>--source</option></term>
+ <listitem><para>
+<!--
+ Use Source index field ordering.
+ Configuration Item: <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+-->
+ ソースインデックスフィールド順ã«ä¸¦ã¹æ›¿ãˆ
+ 設定項目 - <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+ <para><command>apt-sortpkgs</command> ã¯æ­£å¸¸çµ‚了時㫠0 ã‚’è¿”ã—ã¾ã™ã€‚
+ エラー時ã«ã¯å進㮠100 ã‚’è¿”ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt.conf.ja.5.sgml b/doc/ja/apt.conf.ja.5.sgml
deleted file mode 100644
index 3634096f9..000000000
--- a/doc/ja/apt.conf.ja.5.sgml
+++ /dev/null
@@ -1,785 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.9 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt.conf</>
- <manvolnum>5</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt.conf</>
-<!--
- <refpurpose>Configuration file for APT</>
--->
- <refpurpose>APT ÀßÄê¥Õ¥¡¥¤¥ë</>
- </refnamediv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>ÀâÌÀ</>
- <para>
-<!--
- <filename/apt.conf/ is the main configuration file for the APT suite of
- tools, all tools make use of the configuration file and a common command line
- parser to provide a uniform environment. When an APT tool starts up it will
- read the configuration specified by the <envar/APT_CONFIG/ environment
- variable (if any) and then read the files in <literal/Dir::Etc::Parts/
- then read the main configuration file specified by
- <literal/Dir::Etc::main/ then finally apply the
- command line options to override the configuration directives, possibly
- loading even more config files.
--->
- <filename/apt.conf/ ¤Ï¡¢APT ¥Ä¡¼¥ë½¸¤Î¼çÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
- ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤È¶¦Ä̤Υ³¥Þ¥ó¥É¥é¥¤¥ó¥Ñ¡¼¥µ¤ò»È¤Ã¤Æ¡¢
- ¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¤òÅý°ì´Ä¶­¤Ç»ÈÍѤǤ­¤Þ¤¹¡£
- APT ¥Ä¡¼¥ë¤Îµ¯Æ°»þ¤Ë¤Ï¡¢<envar/APT_CONFIG/ ´Ä¶­ÊÑ¿ô¤Ë»ØÄꤷ¤¿ÀßÄê¤ò
- (¸ºß¤¹¤ì¤Ð) Æɤ߹þ¤ß¤Þ¤¹¡£
- ¼¡¤Ë <literal/Dir::Etc::Parts/ ¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
- ¤½¤Î¸å <literal/Dir::Etc::main/ ¤Ç»ØÄꤷ¤¿¼çÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¡¢
- ºÇ¸å¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ç¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤è¤ê¼èÆÀ¤·¤¿Ãͤò¾å½ñ¤­¤·¤Þ¤¹¡£
- <para>
-<!--
- The configuration file is organized in a tree with options organized into
- functional groups. Option specification is given with a double colon
- notation, for instance <literal/APT::Get::Assume-Yes/ is an option within
- the APT tool group, for the Get tool. Options do not inherit from their
- parent groups.
--->
- ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢µ¡Ç½¥°¥ë¡¼¥×¤´¤È¤Ë·ÏÅýΩ¤Æ¤é¤ì¤¿¥ª¥×¥·¥ç¥ó¤ò¡¢
- ÌÚ¹½Â¤¤Çɽ¤·¤Þ¤¹¡£
- ¥ª¥×¥·¥ç¥ó¤ÎÆâÍƤϡ¢2 ¤Ä¤Î¥³¥í¥ó¤Ç¶èÀÚ¤ê¤Þ¤¹¡£
- Î㤨¤Ð <literal/APT::Get::Assume-Yes/ ¤Ï¡¢APT ¥Ä¡¼¥ë¥°¥ë¡¼¥×¤Î¡¢Get ¥Ä¡¼¥ëÍÑ
- ¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤Ï¡¢¿Æ¥°¥ë¡¼¥×¤«¤é·Ñ¾µ¤·¤Þ¤»¤ó¡£
- <para>
-<!--
- Syntacticly the configuration language is modeled after what the ISC tools
- such as bind and dhcp use. Each line is of the form
- <literallayout>APT::Get::Assume-Yes "true";</literallayout> The trailing
- semicolon is required and the quotes are optional. A new scope can be
- opened with curly braces, like:
--->
- ÀßÄê¸À¸ì¤Îʸˡ¤Ï¡¢bind ¤ä dhcp ¤Î¤è¤¦¤Ê ISC ¥Ä¡¼¥ë¤ò¥â¥Ç¥ë¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
- ¤¤¤º¤ì¤Î¹Ô¤â¡¢<literallayout>APT::Get::Assume-Yes "true";</literallayout> ¤Î
- ¤è¤¦¤Ê·Á¤Ç¡¢¥»¥ß¥³¥í¥ó¤Ç¶èÀÚ¤ê¤Þ¤¹¡£¤Þ¤¿°úÍѤϥª¥×¥·¥ç¥ó¤Ç¤¹¡£
- °Ê²¼¤Î¤è¤¦¤ËÃ楫¥Ã¥³¤ò»È¤¦¤È¡¢¿·¤·¤¤¥¹¥³¡¼¥×¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-<informalexample><programlisting>
-APT {
- Get {
- Assume-Yes "true";
- Fix-Broken "true";
- };
-};
-</programlisting></informalexample>
-<!--
- with newlines placed to make it more readable. Lists can be created by
- opening a scope and including a single word enclosed in quotes followed by a
- semicolon. Multiple entries can be included, each seperated by a semicolon.
--->
- ¤Þ¤¿¡¢Å¬µ¹²þ¹Ô¤¹¤ë¤³¤È¤Ç¡¢¤è¤êÆɤߤ䤹¤¯¤Ê¤ê¤Þ¤¹¡£
- ¥ê¥¹¥È¤Ï¡¢³«¤¤¤¿¥¹¥³¡¼¥×¡¢¥¯¥©¡¼¥È¤Ç°Ï¤Þ¤ì¤¿Ã±¸ì¡¢
- ¤½¤·¤Æ¥»¥ß¥³¥í¥ó¤È³¤±¤ë¤³¤È¤ÇºîÀ®¤Ç¤­¤Þ¤¹¡£
- ¥»¥ß¥³¥í¥ó¤Ç¶èÀڤ뤳¤È¤Ç¡¢Ê£¿ô¤Î¥¨¥ó¥È¥ê¤òɽ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-<informalexample><programlisting>
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
-</programlisting></informalexample>
- <para>
-<!--
- In general the sample configuration file in
- <filename>&docdir;/examples/apt.conf</> &configureindex;
- is a good guide for how it should look.
--->
- <filename>&docdir;/examples/apt.conf</> &configureindex; ¤Ï
- °ìÈÌŪ¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤Ç¤¹¡£¤É¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤«»²¹Í¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
- <para>
-<!--
- Two specials are allowed, <literal/#include/ and <literal/#clear/.
- <literal/#include/ will include the given file, unless the filename
- ends in a slash, then the whole directory is included.
- <literal/#clear/ is used to erase a list of names.
--->
- <literal/#include/ ¤È <literal/#clear/ ¤Î 2 ¤Ä¤ÎÆÃÊ̤ʵ­Ë¡¤¬¤¢¤ê¤Þ¤¹¡£
- <literal/#include/ ¤Ï»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ò¼è¤ê¹þ¤ß¤Þ¤¹¡£
- ¥Õ¥¡¥¤¥ë̾¤¬¥¹¥é¥Ã¥·¥å¤Ç½ª¤ï¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤Æ
- ¼è¤ê¹þ¤ß¤Þ¤¹¡£
- <literal/#clear/ ¤Ï̾Á°¤Î¥ê¥¹¥È¤òºï½ü¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹¡£
- <para>
-<!--
- All of the APT tools take a -o option which allows an arbitary configuration
- directive to be specified on the command line. The syntax is a full option
- name (<literal/APT::Get::Assume-Yes/ for instance) followed by an equals
- sign then the new value of the option. Lists can be appended too by adding
- a trailing :: to the list name.
--->
- ¤¹¤Ù¤Æ¤Î APT ¥Ä¡¼¥ë¤Ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇǤ°Õ¤ÎÀßÄê¤ò¹Ô¤¦
- -o ¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤǤ­¤Þ¤¹¡£
- ʸˡ¤Ï¡¢´°Á´¤Ê¥ª¥×¥·¥ç¥ó̾ (Îã¡¢<literal/APT::Get::Assume-Yes/)¡¢
- Åù¹æ¡¢Â³¤¤¤Æ¥ª¥×¥·¥ç¥ó¤Î¿·¤·¤¤ÃͤȤʤê¤Þ¤¹¡£
- ¥ê¥¹¥È̾¤Ë³¤­::¤ò²Ã¤¨¤ë¤³¤È¤Ç¡¢¥ê¥¹¥È¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£
- <!-- arbitary = Ǥ°Õ¤Î (ºÜ¤Ã¤Æ¤Ê¤«¤Ã¤¿¡£¤Þ¤·¤Ê¼­½ñ¤¬Íߤ·¤¤) -->
- </RefSect1>
-
-<!--
- <RefSect1><Title>The APT Group</>
--->
- <RefSect1><Title>APT ¥°¥ë¡¼¥×</>
- <para>
-<!--
- This group of options controls general APT behavior as well as holding the
- options for all of the tools.
--->
- ¤³¤Î¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢¥Ä¡¼¥ëÁ´ÂΤ˱ƶÁ¤Î¤¢¤ë¡¢°ìÈÌŪ¤Ê APT ¤Î¿¶¤ëÉñ¤¤¤ò
- À©¸æ¤·¤Þ¤¹¡£
- <VariableList>
- <VarListEntry><Term>Architecture</Term>
- <ListItem><Para>
-<!--
- System Architecture; sets the architecture to use when fetching files and
- parsing package lists. The internal default is the architecture apt was
- compiled for.
--->
- ¥·¥¹¥Æ¥à¥¢¡¼¥­¥Æ¥¯¥Á¥ã - ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤¿¤ê¡¢¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò
- ²òÀϤ¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
- ÆâÉô¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢apt ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Ignore-Hold</Term>
- <ListItem><Para>
-<!--
- Ignore Held packages; This global option causes the problem resolver to
- ignore held packages in its decision making.
--->
- ÊÝα¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë - ¤³¤Î¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥ó¤Ï¡¢ÌäÂê²ò·è´ï¤ËÊÝα¤È
- »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò̵»ë¤·¤Þ¤¹¡£
- <!-- problem resolver ¤ÏÌäÂê²ò·è´ï¤Ç¤¤¤¤¤Î¤À¤í¤¦¤«¡© -->
- </VarListEntry>
-
- <VarListEntry><Term>Clean-Installed</Term>
- <ListItem><Para>
-<!--
- Defaults to on. When turned on the autoclean feature will remove any pacakges
- which can no longer be downloaded from the cache. If turned off then
- packages that are locally installed are also excluded from cleaning - but
- note that APT provides no direct means to reinstall them.
--->
- ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü -
- ¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ç¤¹¡£autoclean µ¡Ç½¤¬ on ¤Î»þ¡¢¥À¥¦¥ó¥í¡¼¥É
- ¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£
- off ¤Î¾ì¹ç¤Ï¡¢¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢
- ºï½üÂоݤ«¤é³°¤·¤Þ¤¹¡£
- Ãí) APT ¤Ï¡¢¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ò¡¢
- ľÀܤˤÏÄ󶡤·¤Þ¤»¤ó¡£
- </VarListEntry>
-
- <VarListEntry><Term>Immediate-Configure</Term>
- <ListItem><Para>
-<!--
- Disable Immedate Configuration; This dangerous option disables some
- of APT's ordering code to cause it to make fewer dpkg calls. Doing
- so may be necessary on some extremely slow single user systems but
- is very dangerous and may cause package install scripts to fail or worse.
- Use at your own risk.
--->
- ¨»þÀßÄê̵¸ú - ¤³¤Î´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢APT ¤ÎÍ׵ᥳ¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ¡¢
- dpkg ¤Î¸Æ¤Ó½Ð¤·¤ò¤Û¤È¤ó¤É¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢Èó¾ï¤ËÃÙ¤¤¥·¥ó¥°¥ë¥æ¡¼¥¶¥·¥¹¥Æ¥à¤Ç¤ÏɬÍפ«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢
- Èó¾ï¤Ë´í¸±¤Ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤¬¼ºÇÔ¤·¤¿¤ê¡¢
- ¤â¤·¤¯¤Ï¤â¤Ã¤È°­¤¤¤³¤È¤¬¤ª¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- ¼«¸ÊÀÕǤ¤Ç»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
- <!-- Immedate ¤Ï Immediate ¤Î typo? -->
- </VarListEntry>
-
- <VarListEntry><Term>Force-LoopBreak</Term>
- <ListItem><Para>
-<!--
- Never Enable this option unless you -really- know what you are doing. It
- permits APT to temporarily remove an essential package to break a
- Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
- packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option
- will work if the essential packages are not tar, gzip, libc, dpkg, bash or
- anything that those packages depend on.
--->
- ²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤«¡ÖËÜÅö¤Ë¡×Ƚ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢
- ÀäÂФˤ³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
- ÉԲķç (essential) ¥Ñ¥Ã¥±¡¼¥¸¤Î´Ö¤Ç¡¢¶¥¹ç (Conflicts)/ ¶¥¹ç (Conflicts) ¤ä
- ¶¥¹ç (Conflicts)/ »öÁ°É¬¿Ü (Pre-Depend) ¤Î¥ë¡¼¥×¤ËÍî¤Á¹þ¤ó¤À¤È¤­¤Ë¡¢
- ÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ò°ì»þŪ¤Ëºï½ü¤·¤Æ¡¢¥ë¡¼¥×¤òÈ´¤±¤ë»ö¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
- <emphasis>¤½¤ó¤Ê¥ë¡¼¥×¤Ï¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤Ç¡¢
- ¤¢¤ë¤È¤¹¤ì¤Ð½ÅÂç¤Ê¥Ð¥°¤Ç¤¹¡£</emphasis>
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢tar, gzip, libc, dpkg, bash ¤È¤½¤ì¤é¤¬°Í¸¤·¤Æ¤¤¤ë
- ¥Ñ¥Ã¥±¡¼¥¸°Ê³°¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ÇÆ°ºî¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Cache-Limit</Term>
- <ListItem><Para>
-<!--
- APT uses a fixed size memory mapped cache file to store the 'available'
- information. This sets the size of that cache.
--->
- APT ¤Ï¡¢¡ÖÍøÍѲÄǽ¡×¾ðÊó¤ò³ÊǼ¤¹¤ë¤¿¤á¤Ë¡¢¸ÇÄꥵ¥¤¥º¤Î
- ¥á¥â¥ê¥Þ¥Ã¥×¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¤½¤Î¥­¥ã¥Ã¥·¥å¥µ¥¤¥º¤ò»ØÄꤷ¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Build-Essential</Term>
- <ListItem><Para>
-<!--
- Defines which package(s) are considered essential build dependencies.
--->
- ¹½Ã۰͸´Ø·¸¤ÇÉԲķç¤Ê¥Ñ¥Ã¥±¡¼¥¸¤òÄêµÁ¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Get</Term>
- <ListItem><Para>
-<!--
- The Get subsection controls the &apt-get; tool, please see its
- documentation for more information about the options here.
--->
- ¥µ¥Ö¥»¥¯¥·¥ç¥ó Get ¤Ï &apt-get; ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï &apt-get; ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- </VarListEntry>
-
- <VarListEntry><Term>Cache</Term>
- <ListItem><Para>
-<!--
- The Cache subsection controls the &apt-cache; tool, please see its
- documentation for more information about the options here.
--->
- ¥µ¥Ö¥»¥¯¥·¥ç¥ó Cache ¤Ï &apt-cache; ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï &apt-cache; ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- </VarListEntry>
-
- <VarListEntry><Term>CDROM</Term>
- <ListItem><Para>
-<!--
- The CDROM subsection controls the &apt-cdrom; tool, please see its
- documentation for more information about the options here.
--->
- ¥µ¥Ö¥»¥¯¥·¥ç¥ó CDROM ¤Ï &apt-cdrom; ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï &apt-cdrom; ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>The Acquire Group</>
--->
- <RefSect1><Title>Acquire ¥°¥ë¡¼¥×</>
- <para>
-<!--
- The <literal/Acquire/ group of options controls the download of packages
- and the URI handlers.
--->
- <literal/Acquire/ ¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ä
- URI ¥Ï¥ó¥É¥é¤ÎÀ©¸æ¤ò¹Ô¤¤¤Þ¤¹¡£
- <VariableList>
- <VarListEntry><Term>Queue-Mode</Term>
- <ListItem><Para>
-<!--
- Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or
- <literal/access/ which determines how APT parallelizes outgoing
- connections. <literal/host/ means that one connection per target host
- will be opened, <literal/access/ means that one connection per URI type
- will be opened.
--->
- ¥­¥å¡¼¥â¡¼¥É - <literal/Queue-Mode/ ¤ÏAPT¤¬¤É¤Î¤è¤¦¤ËÊÂÎóÀܳ¤ò¹Ô¤¦¤«¡¢
- <literal/host/ ¤« <literal/access/ ¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
- <literal/host/ ¤Ï¡¢¥¿¡¼¥²¥Ã¥È¥Û¥¹¥È¤´¤È¤Ë 1 Àܳ¤ò³«¤­¤Þ¤¹¡£
- <literal/access/ ¤Ï¡¢URI ¥¿¥¤¥×¤´¤È¤Ë 1 Àܳ¤ò³«¤­¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Retries</Term>
- <ListItem><Para>
-<!--
- Number of retries to perform. If this is non-zero APT will retry failed
- files the given number of times.
--->
- ¥ê¥È¥é¥¤¤Î²ó¿ô¤òÀßÄꤷ¤Þ¤¹¡£0 ¤Ç¤Ê¤¤¾ì¹ç¡¢APT ¤Ï¼ºÇÔ¤·¤¿¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¡¢
- Í¿¤¨¤é¤ì¤¿²ó¿ô¤À¤±¥ê¥È¥é¥¤¤ò¹Ô¤¤¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Source-Symlinks</Term>
- <ListItem><Para>
-<!--
- Use symlinks for source archives. If set to true then source archives will
- be symlinked when possible instead of copying. True is the default
--->
- ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»ÈÍѤ·¤Þ¤¹¡£
- true ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¤È¤­¡¢²Äǽ¤Ê¤é¥³¥Ô¡¼¤ÎÂå¤ï¤ê¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬
- Ä¥¤é¤ì¤Þ¤¹¡£true ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>http</Term>
- <ListItem><Para>
-<!--
- HTTP URIs; http::Proxy is the default http proxy to use. It is in the
- standard form of <literal>http://[[user][:pass]@]host[:port]/</>. Per
- host proxies can also be specified by using the form
- <literal/http::Proxy::&lt;host&gt;/ with the special keyword <literal/DIRECT/
- meaning to use no proxies. The <envar/http_proxy/ environment variable
- will override all settings.
--->
- HTTP URI - http::Proxy ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë http ¥×¥í¥­¥·¤Ç¤¹¡£
- <literal>http://[[user][:pass]@]host[:port]/</>¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¡£
- ¥Û¥¹¥È¤´¤È¤Î¥×¥í¥­¥·¤Î¾ì¹ç¤Ï¡¢<literal/http::Proxy::&lt;host&gt;/ ¤È¤¤¤¦
- ·Á¤È¡¢¥×¥í¥­¥·¤ò»ÈÍѤ·¤Ê¤¤¤È¤¤¤¦°ÕÌ£¤ÎÆü쥭¡¼¥ï¡¼¥É <literal/DIRECT/ ¤ò
- »ÈÍѤ·¤Æ»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
- ¤¹¤Ù¤Æ¤ÎÀßÄê¤Ï¡¢´Ä¶­ÊÑ¿ô <envar/http_proxy/ ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
- <para>
-<!--
- Three settings are provided for cache control with HTTP/1.1 complient
- proxy caches. <literal/No-Cache/ tells the proxy to not use its cached
- response under any circumstances, <literal/Max-Age/ is sent only for
- index files and tells the cache to refresh its object if it is older than
- the given number of seconds. Debian updates its index files daily so the
- default is 1 day. <literal/No-Store/ specifies that the cache should never
- store this request, it is only set for archive files. This may be useful
- to prevent polluting a proxy cache with very large .deb files. Note:
- Squid 2.0.2 does not support any of these options.
--->
- HTTP/1.1 ½àµò¤Î¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤ÎÀ©¸æ¤Ë¤Ä¤¤¤Æ¡¢3 ¼ïÎà¤ÎÀßÄ꤬¤¢¤ê¤Þ¤¹¡£
- <literal/No-Cache/ ¤Ï¥×¥í¥­¥·¤ËÂФ·¤Æ¡¢¤¤¤«¤Ê¤ë»þ¤â¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ·¤Ê¤¤
- ¤ÈÅÁ¤¨¤Þ¤¹¡£
- <literal/Max-Age/ ¤Ï¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÍѤΤȤ­¤À¤±Á÷¿®¤·¡¢
- ÆÀ¤é¤ì¤¿»þ´Ö¤è¤ê¤â¸Å¤«¤Ã¤¿¾ì¹ç¤Ë¡¢¥ª¥Ö¥¸¥§¥¯¥È¤ò¥ê¥Õ¥ì¥Ã¥·¥å¤¹¤ë¤è¤¦
- ¥­¥ã¥Ã¥·¥å¤Ë»Ø¼¨¤·¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 1 Æü¤È¤Ê¤Ã¤Æ¤¤¤ë¤¿¤á¡¢Debian ¤ÏÆüËè¤Ë¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹
- ¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤¹¡£
- <literal/No-Store/ ¤Ï¡¢¥­¥ã¥Ã¥·¥å¤¬¤³¤Î¥ê¥¯¥¨¥¹¥È¤ò³ÊǼ¤»¤º¡¢
- ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¤ßÀßÄꤹ¤ë¤è¤¦»ØÄꤷ¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢Èó¾ï¤ËÂ礭¤Ê.deb¥Õ¥¡¥¤¥ë¤Ç¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤¬±ø¤ì¤ë¤Î¤ò¡¢
- Ëɤ°¤Î¤ËÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£
- Ãí) Squid 2.0.2 ¤Ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
- <para>
-<!--
- The option <literal/timeout/ sets the timeout timer used by the method,
- this applies to all things including connection timeout and data timeout.
--->
- <literal/timeout/ ¥ª¥×¥·¥ç¥ó¤Ï¡¢¤³¤ÎÊýË¡¤Ç¤Î¥¿¥¤¥à¥¢¥¦¥È¤Þ¤Ç¤Î»þ´Ö¤ò
- ÀßÄꤷ¤Þ¤¹¡£
- ¤³¤ì¤Ë¤Ï¡¢Àܳ¤Î¥¿¥¤¥à¥¢¥¦¥È¤È¥Ç¡¼¥¿¤Î¥¿¥¤¥à¥¢¥¦¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
- <para>
-<!--
- One setting is provided to control the pipeline depth in cases where the
- remote server is not RFC conforming or buggy (such as Squid 2.0.2)
- <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5
- indicating how many outstanding requests APT should send. A value of
- zero MUST be specified if the remote host does not properly linger
- on TCP connections - otherwise data corruption will occur. Hosts which
- require this are in violation of RFC 2068.
--->
- ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬ RFC ½àµò¤Ç¤Ê¤«¤Ã¤¿¤ê¡¢(Squid 2.0.2 ¤Î¤è¤¦¤Ë) ¥Ð¥°¤¬
- ¤¢¤Ã¤¿¤ê¤·¤¿¤È¤­¤Î¤¿¤á¤Ë¡¢¥Ñ¥¤¥×¥é¥¤¥ó¤Î¿¼¤µ¤ÎÀ©¸æ¤òÀßÄꤷ¤Þ¤¹¡£
- <literal/Acquire::http::Pipeline-Depth/ ¤Ë¤è¤ê¡¢APT ¤¬Á÷¿®¤Ç¤­¤ë
- ¥ê¥¯¥¨¥¹¥È¤Î²ó¿ô¤ò 0 ¤«¤é 5 ¤ÎÃͤÇÀßÄê¤Ç¤­¤Þ¤¹¡£
- ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬Å¬ÀڤǤʤ¯¡¢TCP Àܳ¤Ë»þ´Ö¤¬¤«¤«¤ë¤È¤­¤Ï¡¢
- <emphasis>ɬ¤º</emphasis>0¤ÎÃͤòÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¥Ç¡¼¥¿¤¬ÇË»¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
- ¤³¤ì¤¬É¬Íפʥۥ¹¥È¤Ï¡¢RFC 2068 ¤Ë°ãÈ¿¤·¤Æ¤¤¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>ftp</Term>
- <ListItem><Para>
-<!--
- FTP URIs; ftp::Proxy is the default proxy server to use. It is in the
- standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is
- overriden by the <envar/ftp_proxy/ environment variable. To use a ftp
- proxy you will have to set the <literal/ftp::ProxyLogin/ script in the
- configuration file. This entry specifies the commands to send to tell
- the proxy server what to connect to. Please see
- &configureindex; for an example of
- how to do this. The subsitution variables available are
- <literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, <literal/$(SITE_USER)/,
- <literal/$(SITE_PASS)/, <literal/$(SITE)/, and <literal/$(SITE_PORT)/.
- Each is taken from it's respective URI component.
--->
- FTP URI - ftp::Proxy ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë¥×¥í¥­¥·¥µ¡¼¥Ð¤Ç¤¹¡£
- <literal>ftp://[[user][:pass]@]host[:port]/</> ¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¤¬¡¢
- ´Ä¶­ÊÑ¿ô <envar/ftp_proxy/ ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
- ftp ¥×¥í¥­¥·¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ë <literal/ftp::ProxyLogin/
- ¥¹¥¯¥ê¥×¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
- ¥×¥í¥­¥·¥µ¡¼¥Ð¤ËÁ÷¿®¤¹¤ëÀܳ¥³¥Þ¥ó¥É¤ò¡¢¤³¤Î¥¨¥ó¥È¥ê¤ËÀßÄꤷ¤Þ¤¹¡£
- ¤É¤Î¤è¤¦¤Ë¤¹¤ë¤Î¤«¤Ï &configureindex; ¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- ¤½¤Î¾¤Ë¤â¡¢<literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/,
- <literal/$(SITE_USER)/, <literal/$(SITE_PASS)/, <literal/$(SITE)/,
- <literal/$(SITE_PORT)/ ¤¬ÍøÍѲÄǽ¤Ç¤¹¡£
- ¤¤¤º¤ì¤â¡¢¤½¤ì¤¾¤ì URI ¤ò¹½À®¤¹¤ë¥È¡¼¥¯¥ó¤Ç¤¹¡£
- <para>
-<!--
- The option <literal/timeout/ sets the timeout timer used by the method,
- this applies to all things including connection timeout and data timeout.
--->
- <literal/timeout/ ¥ª¥×¥·¥ç¥ó¤Ï¡¢¤³¤ÎÊýË¡¤Ç¤Î¥¿¥¤¥à¥¢¥¦¥È¤Þ¤Ç¤Î»þ´Ö¤ò
- ÀßÄꤷ¤Þ¤¹¡£
- ¤³¤ì¤Ë¤Ï¡¢Àܳ¤Î¥¿¥¤¥à¥¢¥¦¥È¤È¥Ç¡¼¥¿¤Î¥¿¥¤¥à¥¢¥¦¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
- <para>
-<!--
- Several settings are provided to control passive mode. Generally it is
- safe to leave passive mode on, it works in nearly every environment.
- However some situations require that passive mode be disabled and port
- mode ftp used instead. This can be done globally, for connections that
- go through a proxy or for a specific host (See the sample config file
- for examples)
--->
- ÀßÄê¤Î¤¤¤¯¤Ä¤«¤Ï¡¢¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤òÀ©¸æ¤¹¤ë¤â¤Î¤Ç¤¹¡£
- °ìÈÌŪ¤Ë¡¢¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯Êý¤¬°ÂÁ´¤Ç¡¢
- ¤Û¤Ü¤É¤ó¤Ê´Ä¶­¤Ç¤âÆ°ºî¤·¤Þ¤¹¡£
- ¤·¤«¤·¤¢¤ë¾õ¶·²¼¤Ç¤Ï¡¢¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤¬Ìµ¸ú¤Î¤¿¤á¡¢
- Âå¤ï¤ê¤Ë¥Ý¡¼¥È¥â¡¼¥É ftp ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
- ¤³¤ÎÀßÄê¤Ï¡¢¥×¥í¥­¥·¤òÄ̤ëÀܳ¤äÆÃÄê¤Î¥Û¥¹¥È¤Ø¤ÎÀܳÁ´È̤ËÍ­¸ú¤Ç¤¹¡£
- (ÀßÄêÎã¤Ï¥µ¥ó¥×¥ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)
- <para>
-<!--
- It is possible to proxy FTP over HTTP by setting the <envar/ftp_proxy/
- environment variable to a http url - see the discussion of the http method
- above for syntax. You cannot set this in the configuration file and it is
- not recommended to use FTP over HTTP due to its low efficiency.
--->
- ´Ä¶­ÊÑ¿ô <envar/ftp_proxy/ ¤Î http url ¤Ë¤è¤ê FTP over HTTP ¤Î¥×¥í¥­¥·¤¬
- ÍøÍѲÄǽ¤Ë¤Ê¤ê¤Þ¤¹¡£Ê¸Ë¡¤Ï¾å¤Î http ¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç¤³¤ì¤ò¥»¥Ã¥È¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
- ¤Þ¤¿¡¢¸úΨ¤¬°­¤¤¤¿¤á FTP over HTTP ¤ò»ÈÍѤ¹¤ë¤Î¤Ï¿ä¾©¤·¤Þ¤»¤ó¡£
- <para>
-<!--
- The setting <literal/ForceExtended/ controls the use of RFC2428
- <literal/EPSV/ and <literal/EPRT/ commands. The defaut is false, which means
- these commands are only used if the control connection is IPv6. Setting this
- to true forces their use even on IPv4 connections. Note that most FTP servers
- do not support RFC2428.
--->
- <literal/ForceExtended/ ¤ÎÀßÄê¤Ï RFC2428 ¤Î <literal/EPSV/ ¤È
- <literal/EPRT/ ¥³¥Þ¥ó¥É¤Î»ÈÍѤòÀ©¸æ¤·¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï false ¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥³¥ó¥È¥í¡¼¥ë¥³¥Í¥¯¥·¥ç¥ó¤¬ IPv6
- ¤Î»þ¤Ë¤Î¤ß¡¢¤³¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
- ¤³¤ì¤ò true ¤Ë¥»¥Ã¥È¤¹¤ë¤È¡¢IPv4 ¥³¥Í¥¯¥·¥ç¥ó¤Ç¤â¶¯À©Åª¤Ë¡¢
- ¤³¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
- Ãí) ¤Û¤È¤ó¤É¤Î FTP ¥µ¡¼¥Ð¤Ï RFC2428 ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
- </VarListEntry>
-
- <VarListEntry><Term>cdrom</Term>
- <ListItem><Para>
-<!--
- CDROM URIs; the only setting for CDROM URIs is the mount point,
- <literal/cdrom::Mount/ which must be the mount point for the CDROM drive
- as specified in <filename>/etc/fstab</>. It is possible to provide
- alternate mount and unmount commands if your mount point cannot be listed
- in the fstab (such as an SMB mount and old mount packages). The syntax
- is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within
- the cdrom block. It is important to have the trailing slash. Unmount
- commands can be specified using UMount.
--->
- CDROM URI - ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ÎÀßÄê¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£
- <filename>/etc/fstab</> ¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢CDROM ¥É¥é¥¤¥Ö¤Î
- ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ò <literal/cdrom::Mount/ ¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- (SMB ¥Þ¥¦¥ó¥È¤ä¸Å¤¤ mount ¥Ñ¥Ã¥±¡¼¥¸¤Ê¤É) ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤¬ fstab ¤Ë
- µ­½Ò¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤«¤ï¤ê¤Ë¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¥³¥Þ¥ó¥É¤â»ÈÍѤǤ­¤Þ¤¹¡£
- ʸˡ¤Ï¡¢cdrom ¥Ö¥í¥Ã¥¯¤ò
- <literallayout>"/cdrom/"::Mount "foo";</literallayout> ¤Î·Á¤Çµ­½Ò¤·¤Þ¤¹¡£
- ¥¹¥é¥Ã¥·¥å¤ò¸å¤Ë¤Ä¤±¤ë¤Î¤Ï½ÅÍפǤ¹¡£
- ¥¢¥ó¥Þ¥¦¥ó¥È¥³¥Þ¥ó¥É¤Ï UMount ¤Ç»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Directories</>
--->
- <RefSect1><Title>¥Ç¥£¥ì¥¯¥È¥ê</>
- <para>
-<!--
- The <literal/Dir::State/ section has directories that pertain to local
- state information. <literal/lists/ is the directory to place downloaded
- package lists in and <literal/status/ is the name of the dpkg status file.
- <literal/preferences/ is the name of the APT preferences file.
- <literal/Dir::State/ contains the default directory to prefix on all sub
- items if they do not start with <filename>/</> or <filename>./</>.
--->
- <literal/Dir::State/ ¥»¥¯¥·¥ç¥ó¤Ï¡¢¥í¡¼¥«¥ë¾õÂÖ¾ðÊó¤Ë´Ø¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò
- ÊÝ»ý¤·¤Þ¤¹¡£
- <literal/lists/ ¤Ï¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤ò³ÊǼ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¢
- <literal/status/ ¤Ï dpkg ¤Î¾õÂÖ¥Õ¥¡¥¤¥ë¤Î̾Á°¤òɽ¤·¤Þ¤¹¡£
- <literal/preferences/ ¤Ï APT ¤Î ÀßÄê¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£
- <literal/Dir::State/ ¤Ë¤Ï¡¢<filename>/</> ¤ä <filename>./</>¤Ç»Ï¤Þ¤é¤Ê¤¤
- Á´¥µ¥Ö¥¢¥¤¥Æ¥à¤ËÉղ乤롢¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
- <para>
-<!--
- <literal/Dir::Cache/ contains locations pertaining to local cache
- information, such as the two package caches <literal/srcpkgcache/ and
- <literal/pkgcache/ as well as the location to place downloaded archives,
- <literal/Dir::Cache::archives/. Generation of caches can be turned off
- by setting their names to be blank. This will slow down startup but
- save disk space. It is probably prefered to turn off the pkgcache rather
- than the srcpkgcache. Like <literal/Dir::State/ the default
- directory is contained in <literal/Dir::Cache/
--->
- <literal/Dir::Cache/ ¤Ï¥í¡¼¥«¥ë¥­¥ã¥Ã¥·¥å¾ðÊó¤Ë´Ø¤¹¤ë¾ì½ê¤ò³ÊǼ¤·¤Æ¤¤¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢¥À¥¦¥ó¥í¡¼¥ÉºÑ¥¢¡¼¥«¥¤¥Ö¤Î¾ì½ê¤ò¼¨¤¹ <literal/Dir::Cache::archives/
- ¤ÈƱÍÍ¡¢<literal/srcpkgcache/ ¤È <literal/pkgcache/ ¤Î¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Î
- ¾ì½ê¤È¤Ê¤ê¤Þ¤¹¡£
- ¤½¤ì¤¾¤ì¤ò¶õ¤Ë¥»¥Ã¥È¤¹¤ë¤³¤È¤Ç¡¢¥­¥ã¥Ã¥·¥å¤ÎÀ¸À®¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
- ¤³¤ì¤Ïµ¯Æ°¤¬ÃÙ¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤ÎÀáÌó¤Ë¤Ê¤ê¤Þ¤¹¡£
- ¤ª¤½¤é¤¯¡¢srcpkgcache ¤è¤ê¤â pkgcache ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¡¢
- ¿¤¤¤È»×¤¤¤Þ¤¹¡£
- <literal/Dir::State/ ¤ÈƱÍÍ¡¢<literal/Dir::Cache/ ¤Ï
- ¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
- <para>
-<!--
- <literal/Dir::Etc/ contains the location of configuration files,
- <literal/sourcelist/ gives the location of the sourcelist and
- <literal/main/ is the default configuration file (setting has no effect,
- unless it is done from the config file specified by
- <envar/APT_CONFIG/).
--->
- <literal/Dir::Etc/ ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò³ÊǼ¤·¤Æ¤¤¤Þ¤¹¡£
- <literal/sourcelist/ ¤Ï¥½¡¼¥¹¥ê¥¹¥È¤Î¾ì½ê¤ò¼¨¤·¡¢
- <literal/main/ ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
- (<envar/APT_CONFIG/ ¤ÇÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤵ¤ì¤¿¾ì¹ç¤Î¤ß¡¢
- ¤³¤ÎÀßÄê¤Î¸ú²Ì¤¬¤¢¤ê¤Þ¤¹)
- <para>
-<!--
- The <literal/Dir::Parts/ setting reads in all the config fragments in
- lexical order from the directory specified. After this is done then the
- main config file is loaded.
--->
- <literal/Dir::Parts/ ÀßÄê¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢
- »ú¶çñ°Ì¤ÎÁ´¤Æ¤ÎÀßÄêÃÇÊÒ¤òÆɤߤ³¤ß¤Þ¤¹¡£
- ¤³¤ì¤òÀßÄꤷ¤¿¸å¤Ë¡¢¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£
- <para>
-<!--
- Binary programs are pointed to by <literal/Dir::Bin/. <literal/methods/
- specifies the location of the method handlers and <literal/gzip/,
- <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/,
- <literal/dpkg-buildpackage/ and <literal/apt-cache/ specify the location
- of the respective programs.
--->
- ¥Ð¥¤¥Ê¥ê¥×¥í¥°¥é¥à¤Ï <literal/Dir::Bin/ ¤Ç»ØÄꤷ¤Þ¤¹¡£
- <literal/methods/ ¤Ï¥á¥½¥Ã¥É¥Ï¥ó¥É¥é¤Î¾ì½ê¤ò»ØÄꤷ¡¢
- <literal/gzip/, <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/,
- <literal/dpkg-buildpackage/, <literal/apt-cache/ ¤Ï¤½¤ì¤¾¤ì
- ¥×¥í¥°¥é¥à¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
- </RefSect1>
-
-<!--
- <RefSect1><Title>APT in DSelect</>
--->
- <RefSect1><Title>DSelect ¤Ç¤Î APT</>
- <para>
-<!--
- When APT is used as a &dselect; method several configuration directives
- control the default behaviour. These are in the <literal/DSelect/ section.
--->
- &dselect; ¾å¤Ç APT ¤ò»ÈÍѤ¹¤ëºÝ¡¢<literal/DSelect/ ¥»¥¯¥·¥ç¥ó°Ê²¼¤Î
- ÀßÄê¹àÌܤǡ¢¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤òÀ©¸æ¤·¤Þ¤¹¡£
- <VariableList>
- <VarListEntry><Term>Clean</Term>
- <ListItem><Para>
-<!--
- Cache Clean mode; this value may be one of always, prompt, auto,
- pre-auto and never. always and prompt will remove all packages from
- the cache after upgrading, prompt (the default) does so conditionally.
- auto removes only those packages which are no longer downloadable
- (replaced with a new version for instance). pre-auto performs this
- action before downloading new packages.
--->
- ¥­¥ã¥Ã¥·¥å¥¯¥ê¡¼¥ó¥â¡¼¥É - ¤³¤ÎÃÍ¤Ï always, prompt, auto, pre-auto never
- ¤Î¤¦¤Á¡¢¤Ò¤È¤Ä¤ò¼è¤ê¤Þ¤¹¡£
- always ¤È prompt ¤Ï¹¹¿·¸å¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£
- (¥Ç¥Õ¥©¥ë¥È¤Î) prompt ¤Ç¤Ï¾ò·ïÉÕ¤­¤Çºï½ü¤·¤Þ¤¹¡£
- auto ¤Ï¥À¥¦¥ó¥í¡¼¥ÉÉÔǽ¥Ñ¥Ã¥±¡¼¥¸ (Î㤨¤Ð¿·¥Ð¡¼¥¸¥ç¥ó¤ÇÃÖ¤­´¹¤¨¤é¤ì¤¿¤â¤Î)
- ¤òºï½ü¤·¤Þ¤¹¡£
- pre-auto ¤Ï¤³¤ÎÆ°ºî¤ò¡¢¿·¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëľÁ°¤Ë¹Ô¤¤¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Options</Term>
- <ListItem><Para>
-<!--
- The contents of this variable is passed to &apt-get; as command line
- options when it is run for the install phase.
--->
- ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢install »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍͤˡ¢
- &apt-get; ¤ËÅϤµ¤ì¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>UpdateOptions</Term>
- <ListItem><Para>
-<!--
- The contents of this variable is passed to &apt-get; as command line
- options when it is run for the update phase.
--->
- ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢update »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍͤˡ¢
- &apt-get; ¤ËÅϤµ¤ì¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>PromptAfterUpdate</Term>
- <ListItem><Para>
-<!--
- If true the [U]pdate operation in &dselect; will always prompt to continue.
- The default is to prompt only on error.
--->
- True ¤Î¾ì¹ç¡¢&dselect; ¤Î [U]pdate ¼Â¹Ô»þ¤Ë¡¢Â³¹Ô¤Î¤¿¤á¤Î¥×¥í¥ó¥×¥È¤ò
- Ëè²óɽ¼¨¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>How APT calls dpkg</>
--->
- <RefSect1><Title>APT ¤¬ dpkg ¤ò¸Æ¤ÖÊýË¡</>
- <para>
-<!--
- Several configuration directives control how APT invokes &dpkg;. These are
- in the <literal/DPkg/ section.
--->
- ¿ô¼ï¤ÎÀßÄê¹àÌÜ¤Ç APT ¤¬¤É¤Î¤è¤¦¤Ë &dpkg; ¤ò¸Æ¤Ó½Ð¤¹¤«¤òÀ©¸æ¤Ç¤­¤Þ¤¹¡£
- <literal/DPkg/ ¥»¥¯¥·¥ç¥ó¤Ë¤¢¤ê¤Þ¤¹¡£
- <VariableList>
- <VarListEntry><Term>Options</Term>
- <ListItem><Para>
-<!--
- This is a list of options to pass to dpkg. The options must be specified
- using the list notation and each list item is passed as a single argument
- to &dpkg;.
--->
- dpkg ¤ËÅϤ¹¥ª¥×¥·¥ç¥ó¤Î¥ê¥¹¥È¤Ç¤¹¡£
- ¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ê¥¹¥Èµ­Ë¡¤ò»ÈÍѤ·¤Æ»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¡¢³Æ¥ê¥¹¥È¤Ïñ°ì¤Î°ú¿ô¤È¤·¤Æ &dpkg; ¤ËÅϤµ¤ì¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term>
- <ListItem><Para>
-<!--
- This is a list of shell commands to run before/after invoking &dpkg;.
- Like <literal/Options/ this must be specified in list notation. The
- commands are invoked in order using <filename>/bin/sh</>, should any
- fail APT will abort.
--->
- &dpkg; ¤ò¸Æ¤Ó½Ð¤¹Á°¸å¤Ç¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£
- <literal/Options/ ¤Î¤è¤¦¤Ë¡¢¥ê¥¹¥Èµ­Ë¡¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- ¥³¥Þ¥ó¥É¤Ï <filename>/bin/sh</> ¤ò»ÈÍѤ·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢
- ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Pre-Install-Pkgs</Term>
- <ListItem><Para>
-<!--
- This is a list of shell commands to run before invoking dpkg. Like
- <literal/Options/ this must be specified in list notation. The commands
- are invoked in order using <filename>/bin/sh</>, should any fail APT
- will abort. APT will pass to the commands on standard input the
- filenames of all .deb files it is going to install, one per line.
--->
- &dpkg; ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£
- <literal/Options/ ¤Î¤è¤¦¤Ë¡¢¥ê¥¹¥Èµ­Ë¡¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
- ¥³¥Þ¥ó¥É¤Ï <filename>/bin/sh</> ¤ò»ÈÍѤ·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢
- ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£
- APT ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ëÁ´ .deb ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò¡¢
- ¤Ò¤È¤Ä¤º¤Ä¥³¥Þ¥ó¥É¤Îɸ½àÆþÎϤËÁ÷¤ê¤Þ¤¹¡£
- <para>
-<!--
- Version 2 of this protocol dumps more information, including the
- protocol version, the APT configuration space and the packages, files
- and versions being changed. Version 2 is enabled by setting
- <literal/DPkg::Tools::Options::cmd::Version/ to 2. <literal/cmd/ is a
- command given to <literal/Pre-Install-Pkgs/.
--->
- ¤³¤Î¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤Ç¤Ï¡¢(¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤ä
- APT ÀßÄꥹ¥Ú¡¼¥¹¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤à) ¾ÜºÙ¾ðÊó¤ä¥Õ¥¡¥¤¥ë¡¢
- Êѹ¹¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ·¤Þ¤¹¡£
- <literal/DPkg::Tools::Options::cmd::Version/ ¤Ë 2 ¤ò¥»¥Ã¥È¤¹¤ë¤È¡¢
- ¥Ð¡¼¥¸¥ç¥ó 2 ¤òÍ­¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
- <literal/cmd/ ¤Ï <literal/Pre-Install-Pkgs/ ¤ÇÍ¿¤¨¤é¤ì¤ë¥³¥Þ¥ó¥É¤Ç¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Run-Directory</Term>
- <ListItem><Para>
-<!--
- APT chdirs to this directory before invoking dpkg, the default is
- <filename>/</>.
--->
- APT ¤Ï dpkg ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ï <filename>/</> ¤Ç¤¹¡£
- </VarListEntry>
-
- <VarListEntry><Term>Build-Options</Term>
- <ListItem><Para>
-<!--
- These options are passed to &dpkg-buildpackage; when compiling packages,
- the default is to disable signing and produce all binaries.
--->
- ¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë &dpkg-buildpackage; ¤Ë
- ÅϤµ¤ì¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢½ð̾¤ò̵¸ú¤Ë¤·¡¢Á´¥Ð¥¤¥Ê¥ê¤òÀ¸À®¤·¤Þ¤¹¡£
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Debug Options</>
--->
- <RefSect1><Title>¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó</>
- <para>
-<!--
- Most of the options in the <literal/debug/ section are not interesting to
- the normal user, however <literal/Debug::pkgProblemResolver/ shows
- interesting output about the decisions dist-upgrade makes.
- <literal/Debug::NoLocking/ disables file locking so APT can do some
- operations as non-root and <literal/Debug::pkgDPkgPM/ will print out the
- command line for each dpkg invokation. <literal/Debug::IdentCdrom/ will
- disable the inclusion of statfs data in CDROM IDs.
--->
- <literal/debug/ ¤Î¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ÉáÄ̤Υ桼¥¶¤Ë¤È¤Ã¤Æ¶½Ì£¤ò°ú¤¯¤â¤Î¤Ç¤Ï
- ¤¢¤ê¤Þ¤»¤ó¡£¤·¤«¤·¡¢<literal/Debug::pkgProblemResolver/ ¤Ç¡¢
- dist-upgrade ¤ÎȽÃǤˤĤ¤¤Æ¤Î¶½Ì£¿¼¤¤½ÐÎϤ¬ÆÀ¤é¤ì¤Þ¤¹¡£
- <literal/Debug::NoLocking/ ¤Ï¡¢APT ¤¬Èó root ¤ÇÁàºî¤Ç¤­¤ë¤è¤¦¤Ë
- ¥Õ¥¡¥¤¥ë¤Î¥í¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Þ¤¹¤·¡¢ <literal/Debug::pkgDPkgPM/ ¤Ï¡¢
- dpkg ¤ò¸Æ¤ÖºÝ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤ò½ÐÎϤ·¤Þ¤¹¡£
- <literal/Debug::IdentCdrom/ ¤Ï¡¢CDROM ID ¤Î¾õÂ֥ǡ¼¥¿¤ÎÊñ´Þ¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
- <!-- statfs ¤Ï status ¤Î typo? -->
- </RefSect1>
-
-<!--
- <RefSect1><Title>Examples</>
--->
- <RefSect1><Title>Îã</>
- <para>
-<!--
- &configureindex; contains a
- sample configuration file showing the default values for all possible
- options.
--->
- &configureindex; ¤Ë¡¢Á´ÍøÍѲÄǽ¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»²¾È¤Ç¤­¤ë¡¢
- ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤¬¤¢¤ê¤Þ¤¹¡£
- </RefSect1>
-
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>¥Õ¥¡¥¤¥ë</>
- <para>
- <filename>/etc/apt/apt.conf</>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>»²¾È</>
- <para>
- &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-
-</refentry>
diff --git a/doc/ja/apt.conf.ja.5.xml b/doc/ja/apt.conf.ja.5.xml
new file mode 100644
index 000000000..8707c801e
--- /dev/null
+++ b/doc/ja/apt.conf.ja.5.xml
@@ -0,0 +1,809 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt.conf</refname>
+<!--
+ <refpurpose>Configuration file for APT</refpurpose>
+-->
+ <refpurpose>APT 設定ファイル</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><filename>apt.conf</filename> is the main configuration file for the APT suite of
+ tools, all tools make use of the configuration file and a common command line
+ parser to provide a uniform environment. When an APT tool starts up it will
+ read the configuration specified by the <envar>APT_CONFIG</envar> environment
+ variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal>
+ then read the main configuration file specified by
+ <literal>Dir::Etc::main</literal> then finally apply the
+ command line options to override the configuration directives, possibly
+ loading even more config files.</para>
+-->
+ <para><filename>apt.conf</filename> ã¯ã€
+ APT ツール集ã®ãƒ¡ã‚¤ãƒ³è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚
+ ã“ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã¨å…±é€šã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ‘ーサを使ã£ã¦ã€
+ ã™ã¹ã¦ã®ãƒ„ールを統一環境ã§ä½¿ç”¨ã§ãã¾ã™ã€‚
+ APT ツールã®èµ·å‹•æ™‚ã«ã¯ã€<envar>APT_CONFIG</envar> 環境変数ã«æŒ‡å®šã—ãŸè¨­å®šã‚’
+ (存在ã™ã‚Œã°) 読ã¿è¾¼ã¿ã¾ã™ã€‚
+ 次㫠<literal>Dir::Etc::Parts</literal> ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã¾ã™ã€‚
+ 次㫠<literal>Dir::Etc::main</literal> ã§æŒ‡å®šã—ãŸä¸»è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã€
+ 最後ã«ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ションã§ã€
+ 設定ファイルよりå–å¾—ã—ãŸå€¤ã‚’上書ãã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>The configuration file is organized in a tree with options organized into
+ functional groups. option specification is given with a double colon
+ notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within
+ the APT tool group, for the Get tool. options do not inherit from their
+ parent groups.</para>
+-->
+ <para>設定ファイルã¯ã€
+ 機能グループã”ã¨ã«ç³»çµ±ç«‹ã¦ã‚‰ã‚ŒãŸã‚ªãƒ—ションを木構造ã§è¡¨ã—ã¾ã™ã€‚
+ オプションã®å†…容ã¯ã€2 ã¤ã®ã‚³ãƒ­ãƒ³ã§åŒºåˆ‡ã‚Šã¾ã™ã€‚
+ 例ãˆã° <literal>APT::Get::Assume-Yes</literal> ã¯ã€
+ APT ツールグループã®ã€Get ツール用オプションã§ã™ã€‚
+ オプションã¯ã€è¦ªã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ç¶™æ‰¿ã—ã¾ã›ã‚“。</para>
+
+<!--
+ <para>Syntacticly the configuration language is modeled after what the ISC tools
+ such as bind and dhcp use. Lines starting with
+ <literal>//</literal> are treated as comments (ignored).
+ Each line is of the form
+ <literal>APT::Get::Assume-Yes "true";</literal> The trailing
+ semicolon is required and the quotes are optional. A new scope can be
+ opened with curly braces, like:</para>
+ -->
+ <para>設定言語ã®æ–‡æ³•ã¯ã€
+ bind ã‚„ dhcp ã®ã‚ˆã†ãª ISC ツールをモデルã«ã—ã¦ã„ã¾ã™ã€‚
+ <literal>//</literal> ã§å§‹ã¾ã‚‹è¡Œã¯ã‚³ãƒ¡ãƒ³ãƒˆã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ (無視)。
+ ã„ãšã‚Œã®è¡Œã‚‚ã€<literallayout>APT::Get::Assume-Yes "true";</literallayout> ã®
+ よã†ãªå½¢å¼ã§ã™ã€‚
+ 行末ã®ã‚»ãƒŸã‚³ãƒ­ãƒ³ã¯å¿…è¦ã§ã™ãŒã€ãƒ€ãƒ–ルクォートã¯ä½¿ã‚ãªãã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。
+ 以下ã®ã‚ˆã†ã«ä¸­ã‚«ãƒƒã‚³ã‚’使ã†ã¨ã€æ–°ã—ã„スコープを開ãã“ã¨ãŒã§ãã¾ã™ã€‚</para>
+
+<informalexample><programlisting>
+APT {
+ Get {
+ Assume-Yes "true";
+ Fix-Broken "true";
+ };
+};
+</programlisting></informalexample>
+
+<!--
+ <para>with newlines placed to make it more readable. Lists can be created by
+ opening a scope and including a single word enclosed in quotes followed by a
+ semicolon. Multiple entries can be included, each separated by a semicolon.</para>
+-->
+ <para>ã¾ãŸé©å®œæ”¹è¡Œã™ã‚‹ã“ã¨ã§ã€ã‚ˆã‚Šèª­ã¿ã‚„ã™ããªã‚Šã¾ã™ã€‚
+ リストã¯ã€é–‹ã„ãŸã‚¹ã‚³ãƒ¼ãƒ—ã€ã‚¯ã‚©ãƒ¼ãƒˆã§å›²ã¾ã‚ŒãŸå˜èªžã€
+ ãã—ã¦ã‚»ãƒŸã‚³ãƒ­ãƒ³ã¨ç¶šã‘ã‚‹ã“ã¨ã§ä½œæˆã§ãã¾ã™ã€‚
+ セミコロンã§åŒºåˆ‡ã‚‹ã“ã¨ã§ã€è¤‡æ•°ã®ã‚¨ãƒ³ãƒˆãƒªã‚’表ã™ã“ã¨ãŒã§ãã¾ã™ã€‚</para>
+
+<informalexample><programlisting>
+DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
+</programlisting></informalexample>
+
+<!--
+ <para>In general the sample configuration file in
+ <filename>&docdir;examples/apt.conf</filename> &configureindex;
+ is a good guide for how it should look.</para>
+-->
+ <para><filename>&docdir;examples/apt.conf</filename> &configureindex;
+ ã¯ä¸€èˆ¬çš„ãªè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚µãƒ³ãƒ—ルã§ã™ã€‚
+ ã©ã®ã‚ˆã†ã«è¨­å®šã™ã‚‹ã‹å‚考ã«ãªã‚‹ã§ã—ょã†ã€‚</para>
+
+<!--
+ <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>
+ <literal>#include</literal> will include the given file, unless the filename
+ ends in a slash, then the whole directory is included.
+ <literal>#clear</literal> is used to erase a list of names.</para>
+-->
+ <para><literal>#include</literal> 㨠<literal>#clear</literal> ã®
+ 2 ã¤ã®ç‰¹åˆ¥ãªè¨˜æ³•ãŒã‚ã‚Šã¾ã™ã€‚
+ <literal>#include</literal> ã¯æŒ‡å®šã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–ã‚Šè¾¼ã¿ã¾ã™ã€‚
+ ファイルåãŒã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã§çµ‚ã‚ã£ãŸå ´åˆã«ã¯ã€
+ ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã™ã¹ã¦å–ã‚Šè¾¼ã¿ã¾ã™ã€‚
+ <literal>#clear</literal> ã¯åå‰ã®ãƒªã‚¹ãƒˆã‚’削除ã™ã‚‹ã®ã«ä¾¿åˆ©ã§ã™ã€‚</para>
+
+<!--
+ <para>All of the APT tools take a -o option which allows an arbitrary configuration
+ directive to be specified on the command line. The syntax is a full option
+ name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
+ sign then the new value of the option. Lists can be appended too by adding
+ a trailing :: to the list name.</para>
+-->
+ <para>ã™ã¹ã¦ã® APT ツールã§ã€
+ コマンドラインã§ä»»æ„ã®è¨­å®šã‚’行ㆠ-o オプションãŒä½¿ç”¨ã§ãã¾ã™ã€‚
+ 文法ã¯ã€å®Œå…¨ãªã‚ªãƒ—ションå (例: <literal>APT::Get::Assume-Yes</literal>)ã€
+ ç­‰å·ã€ç¶šã„ã¦ã‚ªãƒ—ションã®æ–°ã—ã„値ã¨ãªã‚Šã¾ã™ã€‚
+ リストåã«ç¶šã::を加ãˆã‚‹ã“ã¨ã§ã€ãƒªã‚¹ãƒˆã‚’追加ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The APT Group</title>
+-->
+ <refsect1><title>APT グループ</title>
+<!--
+ <para>This group of options controls general APT behavior as well as holding the
+ options for all of the tools.</para>
+-->
+ <para>ã“ã®ã‚ªãƒ—ショングループã¯ã€ãƒ„ール全体ã«å½±éŸ¿ã®ã‚ã‚‹ã€
+ 一般的㪠APT ã®æŒ¯ã‚‹èˆžã„を制御ã—ã¾ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>Architecture</term>
+<!--
+ <listitem><para>System Architecture; sets the architecture to use when fetching files and
+ parsing package lists. The internal default is the architecture apt was
+ compiled for.</para></listitem>
+-->
+ <listitem><para>システムアーキテクãƒãƒ£ - ファイルをå–å¾—ã—ãŸã‚Šã€
+ パッケージリストを解æžã™ã‚‹ã¨ãã«ä½¿ç”¨ã™ã‚‹ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã‚’セットã—ã¾ã™ã€‚
+ 内部ã§ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ã€
+ apt をコンパイルã—ãŸã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Ignore-Hold</term>
+<!--
+ <listitem><para>Ignore Held packages; This global option causes the problem resolver to
+ ignore held packages in its decision making.</para></listitem>
+-->
+ <listitem><para>ä¿ç•™ãƒ‘ッケージã®ç„¡è¦– - ã“ã®ã‚°ãƒ­ãƒ¼ãƒãƒ«ã‚ªãƒ—ションã¯ã€
+ å•é¡Œè§£æ±ºå™¨ã«ä¿ç•™ã¨æŒ‡å®šã—ãŸãƒ‘ッケージを無視ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Clean-Installed</term>
+<!--
+ <listitem><para>Defaults to on. When turned on the autoclean feature will remove any packages
+ which can no longer be downloaded from the cache. If turned off then
+ packages that are locally installed are also excluded from cleaning - but
+ note that APT provides no direct means to reinstall them.</para></listitem>
+-->
+ <listitem><para>デフォルトã§æœ‰åŠ¹ã§ã™ã€‚autoclean 機能㌠on ã®æ™‚ã€
+ ダウンロードã§ããªããªã£ãŸãƒ‘ッケージをキャッシュã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚
+ off ã®å ´åˆã€ãƒ­ãƒ¼ã‚«ãƒ«ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„るパッケージã¯ã€
+ 削除対象ã‹ã‚‰å¤–ã—ã¾ã™ã€‚
+ ã—ã‹ã—〠APT ã¯ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‹ã‚‰å‰Šé™¤ã—ãŸãƒ‘ッケージã®å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ–¹æ³•ã‚’ã€
+ 直接æä¾›ã™ã‚‹ã‚ã‘ã§ã¯ãªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Immediate-Configure</term>
+<!--
+ <listitem><para>Disable Immediate Configuration; This dangerous option disables some
+ of APT's ordering code to cause it to make fewer dpkg calls. Doing
+ so may be necessary on some extremely slow single user systems but
+ is very dangerous and may cause package install scripts to fail or worse.
+ Use at your own risk.</para></listitem>
+-->
+ <listitem><para>å³æ™‚設定無効 - ã“ã®å±é™ºãªã‚ªãƒ—ションã¯ã€
+ APT ã®è¦æ±‚コードを無効ã«ã—㦠dpkg ã®å‘¼ã³å‡ºã—ã‚’ã»ã¨ã‚“ã©ã—ãªã„よã†ã«ã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€éžå¸¸ã«é…ã„シングルユーザシステムã§ã¯å¿…è¦ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€
+ éžå¸¸ã«å±é™ºã§ã€ãƒ‘ッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¹ã‚¯ãƒªãƒ—トãŒå¤±æ•—ã—ãŸã‚Šã€
+ ã‚‚ã—ãã¯ã‚‚ã£ã¨æ‚ªã„ã“ã¨ãŒãŠãã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+ 自己責任ã§ä½¿ç”¨ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Force-LoopBreak</term>
+<!--
+ <listitem><para>Never Enable this option unless you -really- know what you are doing. It
+ permits APT to temporarily remove an essential package to break a
+ Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
+ packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option
+ will work if the essential packages are not tar, gzip, libc, dpkg, bash or
+ anything that those packages depend on.</para></listitem>
+-->
+ <listitem><para>何をã—よã†ã¨ã—ã¦ã„ã‚‹ã®ã‹ã€Œæœ¬å½“ã«ã€åˆ¤ã£ã¦ã„ã‚‹ã®ã§ãªã‘ã‚Œã°ã€
+ 絶対ã«ã“ã®ã‚ªãƒ—ションを有効ã«ã—ãªã„ã§ãã ã•ã„。
+ ä¸å¯æ¬  (essential) パッケージåŒå£«ã§ã€
+ ç«¶åˆ (Conflicts) /競åˆã‚„競åˆ/事å‰ä¾å­˜ (Pre-Depend)
+ ã®ãƒ«ãƒ¼ãƒ—ã«è½ã¡è¾¼ã‚“ã ã¨ãã«ã€
+ ä¸å¯æ¬ ãƒ‘ッケージを一時的ã«å‰Šé™¤ã—ã¦ãƒ«ãƒ¼ãƒ—を抜ã‘られるよã†ã«ã—ã¾ã™ã€‚
+ <emphasis>ãã‚“ãªãƒ«ãƒ¼ãƒ—ã¯ã‚ã‚Šå¾—ãªã„ã¯ãšã§ã€
+ ã‚ã‚‹ã¨ã™ã‚Œã°é‡å¤§ãªãƒã‚°ã§ã™ã€‚</emphasis>
+ ã“ã®ã‚ªãƒ—ションã¯ã€tar, gzip, libc, dpkg, bash ã¨ãれらãŒä¾å­˜ã—ã¦ã„ã‚‹
+ パッケージ以外ã®ä¸å¯æ¬ ãƒ‘ッケージã§å‹•ä½œã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Cache-Limit</term>
+<!--
+ <listitem><para>APT uses a fixed size memory mapped cache file to store the 'available'
+ information. This sets the size of that cache (in bytes).</para></listitem>
+-->
+ <listitem><para>APT ã¯ã€Œåˆ©ç”¨å¯èƒ½ã€æƒ…報を格ç´ã™ã‚‹ãŸã‚ã«ã€
+ 固定サイズã®ãƒ¡ãƒ¢ãƒªãƒžãƒƒãƒ—キャッシュファイルを使用ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションã¯ã€ãã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚µã‚¤ã‚ºã‚’指定ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Build-Essential</term>
+<!--
+ <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem>
+-->
+ <listitem><para>構築ä¾å­˜é–¢ä¿‚ã§ä¸å¯æ¬ ãªãƒ‘ッケージを定義ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Get</term>
+<!--
+ <listitem><para>The Get subsection controls the &apt-get; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション Get 㯠&apt-get; ツールを制御ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションã®è©³ç´°ã¯ &apt-get; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Cache</term>
+<!--
+ <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション Cache 㯠&apt-cache; ツールを制御ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションã®è©³ç´°ã¯ &apt-cache; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>CDROM</term>
+<!--
+ <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション CDROM 㯠&apt-cdrom; ツールを制御ã—ã¾ã™ã€‚
+ ã“ã®ã‚ªãƒ—ションã®è©³ç´°ã¯ &apt-cdrom; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Acquire Group</title>
+-->
+ <refsect1><title>Acquire グループ</title>
+<!--
+ <para>The <literal>Acquire</literal> group of options controls the download of packages
+ and the URI handlers.
+-->
+ <para><literal>Acquire</literal> オプショングループã¯ã€
+ パッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚„ URI ãƒãƒ³ãƒ‰ãƒ©ã®åˆ¶å¾¡ã‚’è¡Œã„ã¾ã™ã€‚
+ <variablelist>
+ <varlistentry><term>Queue-Mode</term>
+<!--
+ <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or
+ <literal>access</literal> which determines how APT parallelizes outgoing
+ connections. <literal>host</literal> means that one connection per target host
+ will be opened, <literal>access</literal> means that one connection per URI type
+ will be opened.</para></listitem>
+-->
+ <listitem><para>キューモード - <literal>Queue-Mode</literal> ã¯ã€
+ APT ãŒã©ã®ã‚ˆã†ã«ä¸¦åˆ—接続を行ã†ã‹ã€
+ <literal>host</literal> ã‹ <literal>access</literal> ã§æŒ‡å®šã§ãã¾ã™ã€‚
+ <literal>host</literal> ã¯ã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒ›ã‚¹ãƒˆã”ã¨ã« 1 接続を開ãã¾ã™ã€‚
+ <literal>access</literal> ã¯ã€
+ URI タイプã”ã¨ã« 1 接続を開ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Retries</term>
+<!--
+ <listitem><para>Number of retries to perform. If this is non-zero APT will retry failed
+ files the given number of times.</para></listitem>
+-->
+ <listitem><para>リトライã®å›žæ•°ã‚’設定ã—ã¾ã™ã€‚
+ 0 ã§ãªã„å ´åˆã€APT ã¯å¤±æ•—ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€
+ 与ãˆã‚‰ã‚ŒãŸå›žæ•°ã ã‘リトライを行ã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Source-Symlinks</term>
+<!--
+ <listitem><para>Use symlinks for source archives. If set to true then source archives will
+ be symlinked when possible instead of copying. True is the default.</para></listitem>
+-->
+ <listitem><para>ソースアーカイブã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã‚’使用ã—ã¾ã™ã€‚
+ true ãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹ã¨ãã€å¯èƒ½ãªã‚‰ã‚³ãƒ”ーã®ä»£ã‚ã‚Šã«ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ãŒ
+ 張られã¾ã™ã€‚true ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>http</term>
+<!--
+ <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the
+ standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per
+ host proxies can also be specified by using the form
+ <literal>http::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal>
+ meaning to use no proxies. The <envar>http_proxy</envar> environment variable
+ will override all settings.</para>
+-->
+ <listitem><para>HTTP URI - http::Proxy ã¯ã€
+ デフォルトã§ä½¿ç”¨ã™ã‚‹ http プロキシã§ã™ã€‚
+ <literal>http://[[user][:pass]@]host[:port]/</literal>
+ ã¨ã„ã†æ¨™æº–å½¢ã§è¡¨ã—ã¾ã™ã€‚ホストã”ã¨ã®ãƒ—ロキシã®å ´åˆã¯ã€
+ <literal>http::Proxy::&lt;host&gt;</literal> ã¨ã„ã†å½¢ã¨ã€
+ プロキシを使用ã—ãªã„ã¨ã„ã†æ„味ã®ç‰¹æ®Šã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ <literal>DIRECT</literal>
+ を使用ã—ã¦æŒ‡å®šã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ã™ã¹ã¦ã®è¨­å®šã¯ã€
+ 環境変数 <envar>http_proxy</envar> ã§ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚</para>
+
+<!--
+ <para>Three settings are provided for cache control with HTTP/1.1 compliant
+ proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached
+ response under any circumstances, <literal>Max-Age</literal> is sent only for
+ index files and tells the cache to refresh its object if it is older than
+ the given number of seconds. Debian updates its index files daily so the
+ default is 1 day. <literal>No-Store</literal> specifies that the cache should never
+ store this request, it is only set for archive files. This may be useful
+ to prevent polluting a proxy cache with very large .deb files. Note:
+ Squid 2.0.2 does not support any of these options.</para>
+-->
+ <para>HTTP/1.1 準拠ã®ãƒ—ロキシキャッシュã®åˆ¶å¾¡ã«ã¤ã„ã¦ã€
+ 3 種類ã®è¨­å®šãŒã‚ã‚Šã¾ã™ã€‚<literal>No-Cache</literal> ã¯ãƒ—ロキシã«å¯¾ã—ã¦ã€
+ ã„ã‹ãªã‚‹æ™‚もキャッシュを使用ã—ãªã„ã¨ä¼ãˆã¾ã™ã€‚
+ <literal>Max-Age</literal> ã¯ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ç”¨ã®ã¨ãã ã‘é€ä¿¡ã—ã€
+ 得られãŸæ™‚間よりもå¤ã‹ã£ãŸå ´åˆã«ã€
+ オブジェクトをリフレッシュã™ã‚‹ã‚ˆã†ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã«æŒ‡ç¤ºã—ã¾ã™ã€‚
+ デフォルトã§ã¯ 1 æ—¥ã¨ãªã£ã¦ã„ã‚‹ãŸã‚ã€
+ Debian ã¯æ—¥æ¯Žã«ãã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ›´æ–°ã—ã¾ã™ã€‚
+ <literal>No-Store</literal> ã¯ã€ã‚­ãƒ£ãƒƒã‚·ãƒ¥ãŒã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’æ ¼ç´ã›ãšã€
+ アーカイブファイルã®ã¿è¨­å®šã™ã‚‹ã‚ˆã†æŒ‡å®šã—ã¾ã™ã€‚
+ ã“ã‚Œã¯ã€éžå¸¸ã«å¤§ã㪠.deb ファイルã§ãƒ—ロキシキャッシュãŒæ±šã‚Œã‚‹ã®ã‚’ã€
+ 防ãã®ã«ä¾¿åˆ©ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+ 注) Squid 2.0.2 ã§ã¯ã€ã“れらã®ã‚ªãƒ—ションをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。</para>
+
+<!--
+ <para>The option <literal>timeout</literal> sets the timeout timer used by the method,
+ this applies to all things including connection timeout and data timeout.</para>
+-->
+ <para><literal>timeout</literal> オプションã¯ã€
+ ã“ã®æ–¹æ³•ã§ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã¾ã§ã®æ™‚間を設定ã—ã¾ã™ã€‚
+ ã“ã‚Œã«ã¯ã€æŽ¥ç¶šã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã¨ãƒ‡ãƒ¼ã‚¿ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>One setting is provided to control the pipeline depth in cases where the
+ remote server is not RFC conforming or buggy (such as Squid 2.0.2)
+ <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5
+ indicating how many outstanding requests APT should send. A value of
+ zero MUST be specified if the remote host does not properly linger
+ on TCP connections - otherwise data corruption will occur. Hosts which
+ require this are in violation of RFC 2068.</para></listitem>
+-->
+ <para>リモートサーãƒãŒ RFC 準拠ã§ãªã‹ã£ãŸã‚Šã€
+ (Squid 2.0.2 ã®ã‚ˆã†ã«) ãƒã‚°ãŒã‚ã£ãŸã‚Šã—ãŸã¨ãã®ãŸã‚ã«ã€
+ パイプラインã®æ·±ã•ã®åˆ¶å¾¡ã‚’設定ã—ã¾ã™ã€‚
+ <literal>Acquire::http::Pipeline-Depth</literal> ã«ã‚ˆã‚Šã€
+ APT ãŒé€ä¿¡ã§ãるリクエストã®å›žæ•°ã‚’ 0 ã‹ã‚‰ 5 ã®å€¤ã§è¨­å®šã§ãã¾ã™ã€‚
+ リモートサーãƒãŒé©åˆ‡ã§ãªãã€TCP 接続ã«æ™‚é–“ãŒã‹ã‹ã‚‹ã¨ãã¯ã€
+ <emphasis>å¿…ãš</emphasis> 0 ã®å€¤ã‚’設定ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ ãã†ã§ãªã‘ã‚Œã°ãƒ‡ãƒ¼ã‚¿ãŒç ´æã—ã¦ã—ã¾ã„ã¾ã™ã€‚
+ ã“ã‚ŒãŒå¿…è¦ãªãƒ›ã‚¹ãƒˆã¯ RFC 2068 ã«é•åã—ã¦ã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ftp</term>
+<!--
+ <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the
+ standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is
+ overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp
+ proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the
+ configuration file. This entry specifies the commands to send to tell
+ the proxy server what to connect to. Please see
+ &configureindex; for an example of
+ how to do this. The subsitution variables available are
+ <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+ <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>
+ Each is taken from it's respective URI component.</para>
+-->
+ <listitem><para>FTP URI - ftp::Proxy ã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ä½¿ç”¨ã™ã‚‹ãƒ—ロキシサーãƒã§ã™ã€‚
+ <literal>ftp://[[user][:pass]@]host[:port]/</literal> ã¨ã„ã†æ¨™æº–å½¢ã§è¡¨ã—ã¾ã™ãŒã€
+ 環境変数 <envar>ftp_proxy</envar> ã§ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚
+ ftp プロキシを使用ã™ã‚‹ã«ã¯ã€è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã« <literal>ftp::ProxyLogin</literal>
+ スクリプトを設定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ プロキシサーãƒã«é€ä¿¡ã™ã‚‹æŽ¥ç¶šã‚³ãƒžãƒ³ãƒ‰ã‚’ã€ã“ã®ã‚¨ãƒ³ãƒˆãƒªã«è¨­å®šã—ã¾ã™ã€‚
+ ã©ã®ã‚ˆã†ã«ã™ã‚‹ã®ã‹ã¯ &configureindex; ã®ä¾‹ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ ãã®ä»–ã«ã‚‚ã€<literal>$(PROXY_USER)</literal>
+ <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+ <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal>
+ <literal>$(SITE_PORT)</literal> ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚
+ ã„ãšã‚Œã‚‚ã€ãã‚Œãžã‚Œ URI を構æˆã™ã‚‹ãƒˆãƒ¼ã‚¯ãƒ³ã§ã™ã€‚</para>
+
+<!--
+ <para>The option <literal>timeout</literal> sets the timeout timer used by the method,
+ this applies to all things including connection timeout and data timeout.</para>
+-->
+ <para><literal>timeout</literal> オプションã¯ã€
+ ã“ã®æ–¹æ³•ã§ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã¾ã§ã®æ™‚間を設定ã—ã¾ã™ã€‚
+ ã“ã‚Œã«ã¯ã€æŽ¥ç¶šã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã¨ãƒ‡ãƒ¼ã‚¿ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>Several settings are provided to control passive mode. Generally it is
+ safe to leave passive mode on, it works in nearly every environment.
+ However some situations require that passive mode be disabled and port
+ mode ftp used instead. This can be done globally, for connections that
+ go through a proxy or for a specific host (See the sample config file
+ for examples).</para>
+-->
+ <para>設定ã®ã„ãã¤ã‹ã¯ã€ãƒ‘ッシブモードを制御ã™ã‚‹ã‚‚ã®ã§ã™ã€‚
+ 一般的ã«ã€ãƒ‘ッシブモードã®ã¾ã¾ã«ã—ã¦ãŠãæ–¹ãŒå®‰å…¨ã§ã€
+ ã»ã¼ã©ã‚“ãªç’°å¢ƒã§ã‚‚動作ã—ã¾ã™ã€‚
+ ã—ã‹ã—ã‚る状æ³ä¸‹ã§ã¯ã€ãƒ‘ッシブモードãŒç„¡åŠ¹ã®ãŸã‚ã€
+ 代ã‚ã‚Šã«ãƒãƒ¼ãƒˆãƒ¢ãƒ¼ãƒ‰ ftp を使用ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ ã“ã®è¨­å®šã¯ã€ãƒ—ロキシを通る接続や特定ã®ãƒ›ã‚¹ãƒˆã¸ã®æŽ¥ç¶šå…¨èˆ¬ã«æœ‰åŠ¹ã§ã™ã€‚
+ (設定例ã¯ã‚µãƒ³ãƒ—ル設定ファイルをå‚ç…§ã—ã¦ãã ã•ã„)</para>
+
+<!--
+ <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
+ environment variable to a http url - see the discussion of the http method
+ above for syntax. You cannot set this in the configuration file and it is
+ not recommended to use FTP over HTTP due to its low efficiency.</para>
+-->
+ <para>環境変数 <envar>ftp_proxy</envar> ã® http url ã«ã‚ˆã‚Š
+ FTP over HTTP ã®ãƒ—ロキシãŒåˆ©ç”¨å¯èƒ½ã«ãªã‚Šã¾ã™ã€‚
+ 文法ã¯ä¸Šã® http ã«ã¤ã„ã¦ã®èª¬æ˜Žã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ 設定ファイルã®ä¸­ã§ã“れをセットã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
+ ã¾ãŸã€åŠ¹çŽ‡ãŒæ‚ªã„ãŸã‚ FTP over HTTP を使用ã™ã‚‹ã®ã¯æŽ¨å¥¨ã—ã¾ã›ã‚“。</para>
+
+<!--
+ <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428
+ <literal>EPSV</literal> and <literal>EPRT</literal> commands. The defaut is false, which means
+ these commands are only used if the control connection is IPv6. Setting this
+ to true forces their use even on IPv4 connections. Note that most FTP servers
+ do not support RFC2428.</para></listitem>
+-->
+ <para><literal>ForceExtended</literal> ã®è¨­å®šã¯ RFC2428 ã®
+ <literal>EPSV</literal> コマンド㨠<literal>EPRT</literal>
+ コマンドã®ä½¿ç”¨ã‚’制御ã—ã¾ã™ã€‚デフォルトã§ã¯ false ã§ã™ã€‚
+ ã“ã‚Œã¯ã€ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚³ãƒã‚¯ã‚·ãƒ§ãƒ³ãŒ IPv6 ã®æ™‚ã«ã®ã¿ã€
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’使用ã™ã‚‹ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+ ã“れを true ã«ã‚»ãƒƒãƒˆã™ã‚‹ã¨ã€IPv4 コãƒã‚¯ã‚·ãƒ§ãƒ³ã§ã‚‚強制的ã«ã€
+ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’使用ã—ã¾ã™ã€‚
+ 注) ã»ã¨ã‚“ã©ã® FTP サーãƒã¯ RFC2428 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>cdrom</term>
+<!--
+ <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point,
+ <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive
+ as specified in <filename>/etc/fstab</filename>. It is possible to provide
+ alternate mount and unmount commands if your mount point cannot be listed
+ in the fstab (such as an SMB mount and old mount packages). The syntax
+ is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within
+ the cdrom block. It is important to have the trailing slash. Unmount
+ commands can be specified using UMount.</para></listitem>
+-->
+ <listitem><para>CDROM URI - マウントãƒã‚¤ãƒ³ãƒˆã®è¨­å®šã®ã¿ã‚’è¡Œã„ã¾ã™ã€‚
+ <filename>/etc/fstab</filename> ã§è¨­å®šã•ã‚Œã¦ã„るよã†ã«ã€
+ CDROM ドライブã®ãƒžã‚¦ãƒ³ãƒˆãƒã‚¤ãƒ³ãƒˆã‚’
+ <literal>cdrom::Mount</literal> ã«è¨­å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ (SMB マウントやå¤ã„ mount パッケージãªã©) マウントãƒã‚¤ãƒ³ãƒˆãŒ fstab
+ ã«è¨˜è¿°ã§ããªã„å ´åˆã€ã‹ã‚ã‚Šã«ãƒžã‚¦ãƒ³ãƒˆãƒ»ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã‚³ãƒžãƒ³ãƒ‰ã‚‚使用ã§ãã¾ã™ã€‚
+ 文法ã¯ã€cdrom ブロックを
+ <literallayout>"/cdrom/"::Mount "foo";</literallayout> ã®å½¢ã§è¨˜è¿°ã—ã¾ã™ã€‚
+ スラッシュを後ã«ã¤ã‘ã‚‹ã®ã¯é‡è¦ã§ã™ã€‚
+ アンマウントコマンド㯠UMount ã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>gpgv</term>
+<!--
+ <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
+ <literal>gpgv::Options</literal> Additional options passed to gpgv.
+ </para></listitem>
+-->
+ <listitem><para>GPGV URI - GPGV URI 用ã®å”¯ä¸€ã®ã‚ªãƒ—ションã¯ã€
+ gpgv ã«æ¸¡ã™è¿½åŠ ãƒ‘ラメータã®ã‚ªãƒ—ションã§ã™ã€‚
+ <literal>gpgv::Options</literal> gpgv ã«æ¸¡ã™è¿½åŠ ã‚ªãƒ—ション。
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Directories</title>
+-->
+ <refsect1><title>ディレクトリ</title>
+
+<!--
+ <para>The <literal>Dir::State</literal> section has directories that pertain to local
+ state information. <literal>lists</literal> is the directory to place downloaded
+ package lists in and <literal>status</literal> is the name of the dpkg status file.
+ <literal>preferences</literal> is the name of the APT preferences file.
+ <literal>Dir::State</literal> contains the default directory to prefix on all sub
+ items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>
+-->
+ <para><literal>Dir::State</literal> セクションã¯ã€
+ ローカル状態情報ã«é–¢ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ä¿æŒã—ã¾ã™ã€‚
+ <literal>lists</literal> ã¯ã€
+ ダウンロードã—ãŸãƒ‘ッケージ一覧を格ç´ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã€
+ <literal>status</literal> 㯠dpkg ã®çŠ¶æ…‹ãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‚’表ã—ã¾ã™ã€‚
+ <literal>preferences</literal> 㯠APT 㮠設定ファイルã®åå‰ã§ã™ã€‚
+ <literal>Dir::State</literal> ã«ã¯ã€
+ <filename>/</filename> ã‚„ <filename>./</filename> ã§å§‹ã¾ã‚‰ãªã„
+ 全サブアイテムã«ä»˜åŠ ã™ã‚‹ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å«ã‚“ã§ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para><literal>Dir::Cache</literal> contains locations pertaining to local cache
+ information, such as the two package caches <literal>srcpkgcache</literal> and
+ <literal>pkgcache</literal> as well as the location to place downloaded archives,
+ <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
+ by setting their names to be blank. This will slow down startup but
+ save disk space. It is probably prefered to turn off the pkgcache rather
+ than the srcpkgcache. Like <literal>Dir::State</literal> the default
+ directory is contained in <literal>Dir::Cache</literal></para>
+-->
+ <para><literal>Dir::Cache</literal> ã¯ã€
+ ローカルキャッシュ情報ã«é–¢ã™ã‚‹å ´æ‰€ã‚’æ ¼ç´ã—ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€
+ ダウンロード済アーカイブã®å ´æ‰€ã‚’示㙠<literal>Dir::Cache::archives</literal>
+ ã¨åŒæ§˜ã«ã€<literal>srcpkgcache</literal> 㨠<literal>pkgcache</literal>
+ ã®ãƒ‘ッケージキャッシュã®å ´æ‰€ã¨ãªã‚Šã¾ã™ã€‚
+ ãã‚Œãžã‚Œã‚’空ã«ã‚»ãƒƒãƒˆã™ã‚‹ã“ã¨ã§ã€ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã®ç”Ÿæˆã‚’無効ã«ã§ãã¾ã™ã€‚
+ ãŠãらãã€srcpkgcache よりも pkgcache を無効ã«ã™ã‚‹ã“ã¨ãŒå¤šã„ã¨æ€ã„ã¾ã™ã€‚
+ <literal>Dir::State</literal> ã¨åŒæ§˜ã€<literal>Dir::Cache</literal>
+ ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å«ã‚“ã§ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para><literal>Dir::Etc</literal> contains the location of configuration files,
+ <literal>sourcelist</literal> gives the location of the sourcelist and
+ <literal>main</literal> is the default configuration file (setting has no effect,
+ unless it is done from the config file specified by
+ <envar>APT_CONFIG</envar>).</para>
+-->
+ <para><literal>Dir::Etc</literal> ã¯è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã®å ´æ‰€ã‚’æ ¼ç´ã—ã¦ã„ã¾ã™ã€‚
+ <literal>sourcelist</literal> ã¯ã‚½ãƒ¼ã‚¹ãƒªã‚¹ãƒˆã®å ´æ‰€ã‚’示ã—ã€
+ <literal>main</literal> ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚
+ (<envar>APT_CONFIG</envar> ã§è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã•ã‚ŒãŸå ´åˆã®ã¿ã€
+ ã“ã®è¨­å®šã®åŠ¹æžœãŒã‚ã‚Šã¾ã™)</para>
+
+<!--
+ <para>The <literal>Dir::Parts</literal> setting reads in all the config fragments in
+ lexical order from the directory specified. After this is done then the
+ main config file is loaded.</para>
+-->
+ <para><literal>Dir::Parts</literal> 設定ã¯ã€æŒ‡å®šã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ã€
+ å­—å¥å˜ä½ã®å…¨ã¦ã®è¨­å®šæ–­ç‰‡ã‚’読ã¿ã“ã¿ã¾ã™ã€‚
+ ã“れを設定ã—ãŸå¾Œã«ã€ãƒ¡ã‚¤ãƒ³è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ロードã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal>
+ specifies the location of the method handlers and <literal>gzip</literal>,
+ <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</literal>
+ <literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> specify the location
+ of the respective programs.</para>
+-->
+ <para>ãƒã‚¤ãƒŠãƒªãƒ—ログラム㯠<literal>Dir::Bin</literal> ã§æŒ‡å®šã—ã¾ã™ã€‚
+ <literal>Dir::Bin::Methods</literal> ã¯ãƒ¡ã‚½ãƒƒãƒ‰ãƒãƒ³ãƒ‰ãƒ©ã®å ´æ‰€ã‚’指定ã—ã€
+ <literal>gzip</literal>, <literal>dpkg</literal>,
+ <literal>apt-get</literal>, <literal>dpkg-source</literal>,
+ <literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal>
+ ã¯ãã‚Œãžã‚Œãƒ—ログラムã®å ´æ‰€ã‚’指定ã—ã¾ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>APT in DSelect</title>
+-->
+ <refsect1><title>DSelect ã§ã® APT</title>
+<!--
+ <para>
+ When APT is used as a &dselect; method several configuration directives
+ control the default behaviour. These are in the <literal>DSelect</literal> section.</para>
+-->
+ <para>
+ &dselect; 上㧠APT を使用ã™ã‚‹éš›ã€
+ <literal>DSelect</literal> セクション以下ã®è¨­å®šé …ç›®ã§ã€
+ デフォルトã®å‹•ä½œã‚’制御ã—ã¾ã™ã€‚</para>
+ <variablelist>
+ <varlistentry><term>Clean</term>
+<!--
+ <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto,
+ pre-auto and never. always and prompt will remove all packages from
+ the cache after upgrading, prompt (the default) does so conditionally.
+ auto removes only those packages which are no longer downloadable
+ (replaced with a new version for instance). pre-auto performs this
+ action before downloading new packages.</para></listitem>
+-->
+ <listitem><para>キャッシュクリーンモード -
+ ã“ã®å€¤ã¯ always, prompt, auto, pre-auto, never ã®ã†ã¡ã²ã¨ã¤ã‚’å–ã‚Šã¾ã™ã€‚
+ always 㨠prompt ã¯æ›´æ–°å¾Œã€å…¨ãƒ‘ッケージをキャッシュã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚
+ (デフォルトã®) prompt ã§ã¯æ¡ä»¶ä»˜ãã§å‰Šé™¤ã—ã¾ã™ã€‚
+ auto ã¯ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ä¸èƒ½ãƒ‘ッケージ (例ãˆã°æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ç½®ãæ›ãˆã‚‰ã‚ŒãŸã‚‚ã®)
+ を削除ã—ã¾ã™ã€‚pre-auto ã¯ã“ã®å‹•ä½œã‚’ã€
+ 新パッケージをダウンロードã™ã‚‹ç›´å‰ã«è¡Œã„ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>options</term>
+<!--
+ <listitem><para>The contents of this variable is passed to &apt-get; as command line
+ options when it is run for the install phase.</para></listitem>
+-->
+ <listitem><para>ã“ã®å¤‰æ•°ã®å†…容ã¯ã€
+ install 時ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ションã¨åŒæ§˜ã« &apt-get; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Updateoptions</term>
+<!--
+ <listitem><para>The contents of this variable is passed to &apt-get; as command line
+ options when it is run for the update phase.</para></listitem>
+-->
+ <listitem><para>ã“ã®å¤‰æ•°ã®å†…容ã¯ã€
+ update 時ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ションã¨åŒæ§˜ã« &apt-get; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>PromptAfterUpdate</term>
+<!--
+ <listitem><para>If true the [U]pdate operation in &dselect; will always prompt to continue.
+ The default is to prompt only on error.</para></listitem>
+-->
+ <listitem><para>true ã®å ´åˆã€
+ &dselect; ã® [U]pdate 実行時ã«ã€ç¶šè¡Œã®ãŸã‚ã®ãƒ—ロンプトを毎回表示ã—ã¾ã™ã€‚
+ デフォルトã¯ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆã®ã¿ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>How APT calls dpkg</title>
+-->
+ <refsect1><title>APT ㌠dpkg を呼ã¶æ–¹æ³•</title>
+<!--
+ <para>Several configuration directives control how APT invokes &dpkg;. These are
+ in the <literal>DPkg</literal> section.</para>
+-->
+ <para>数種ã®è¨­å®šé …目㧠APT ãŒã©ã®ã‚ˆã†ã« &dpkg; を呼ã³å‡ºã™ã‹ã‚’制御ã§ãã¾ã™ã€‚
+ <literal>DPkg</literal> セクションã«ã‚ã‚Šã¾ã™ã€‚</para>
+
+ <variablelist>
+ <varlistentry><term>options</term>
+<!--
+ <listitem><para>This is a list of options to pass to dpkg. The options must be specified
+ using the list notation and each list item is passed as a single argument
+ to &dpkg;.</para></listitem>
+-->
+ <listitem><para>dpkg ã«æ¸¡ã™ã‚ªãƒ—ションã®ãƒªã‚¹ãƒˆã§ã™ã€‚
+ オプションã¯ã€ãƒªã‚¹ãƒˆè¨˜æ³•ã‚’使用ã—ã¦æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ ã¾ãŸã€å„リストã¯å˜ä¸€ã®å¼•æ•°ã¨ã—㦠&dpkg; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Pre-Invoke</term><term>Post-Invoke</term>
+<!--
+ <listitem><para>This is a list of shell commands to run before/after invoking &dpkg;.
+ Like <literal>options</literal> this must be specified in list notation. The
+ commands are invoked in order using <filename>/bin/sh</filename>, should any
+ fail APT will abort.</para></listitem>
+-->
+ <listitem><para>&dpkg; を呼ã³å‡ºã™å‰å¾Œã§å®Ÿè¡Œã™ã‚‹ã‚·ã‚§ãƒ«ã‚³ãƒžãƒ³ãƒ‰ã®ãƒªã‚¹ãƒˆã§ã™ã€‚
+ <literal>options</literal> ã®ã‚ˆã†ã«ãƒªã‚¹ãƒˆè¨˜æ³•ã§æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ コマンド㯠<filename>/bin/sh</filename> を使用ã—ã¦å‘¼ã³å‡ºã•ã‚Œã€
+ 何ã‹å•é¡ŒãŒã‚ã‚Œã°ã€APT ã¯ç•°å¸¸çµ‚了ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Pre-Install-Pkgs</term>
+<!--
+ <listitem><para>This is a list of shell commands to run before invoking dpkg. Like
+ <literal>options</literal> this must be specified in list notation. The commands
+ are invoked in order using <filename>/bin/sh</filename>, should any fail APT
+ will abort. APT will pass to the commands on standard input the
+ filenames of all .deb files it is going to install, one per line.</para>
+-->
+ <listitem><para>&dpkg; を呼ã³å‡ºã™å‰ã«å®Ÿè¡Œã™ã‚‹ã‚·ã‚§ãƒ«ã‚³ãƒžãƒ³ãƒ‰ã®ãƒªã‚¹ãƒˆã§ã™ã€‚
+ <literal>options</literal> ã®ã‚ˆã†ã«ãƒªã‚¹ãƒˆè¨˜æ³•ã§æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ コマンド㯠<filename>/bin/sh</filename> を通ã—ã¦å‘¼ã³å‡ºã•ã‚Œã€
+ 何ã‹å•é¡ŒãŒã‚ã‚Œã°ã€APT ã¯ç•°å¸¸çµ‚了ã—ã¾ã™ã€‚
+ APT ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—よã†ã¨ã™ã‚‹å…¨ .deb ファイルã®ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ã€
+ ã²ã¨ã¤ãšã¤ã‚³ãƒžãƒ³ãƒ‰ã®æ¨™æº–入力ã«é€ã‚Šã¾ã™ã€‚</para>
+
+<!--
+ <para>Version 2 of this protocol dumps more information, including the
+ protocol version, the APT configuration space and the packages, files
+ and versions being changed. Version 2 is enabled by setting
+ <literal>DPkg::Tools::options::cmd::Version</literal> to 2. <literal>cmd</literal> is a
+ command given to <literal>Pre-Install-Pkgs</literal>.</para></listitem>
+-->
+ <para>ã“ã®ãƒ—ロトコルã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 2 ã§ã¯ã€(プロトコルã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚„
+ APT 設定スペースã€ãƒ‘ッケージをå«ã‚€) 詳細情報やファイルã€
+ 変更ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’出力ã—ã¾ã™ã€‚
+ <literal>DPkg::Tools::options::cmd::Version</literal> ã« 2 を設定ã™ã‚‹ã¨ã€
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 2 を有効ã«ã§ãã¾ã™ã€‚
+ <literal>cmd</literal> 㯠<literal>Pre-Install-Pkgs</literal>
+ ã§ä¸Žãˆã‚‰ã‚Œã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Run-Directory</term>
+<!--
+ <listitem><para>APT chdirs to this directory before invoking dpkg, the default is
+ <filename>/</filename>.</para></listitem>
+-->
+ <listitem><para>APT 㯠dpkg を呼ã³å‡ºã™å‰ã«ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ç§»å‹•ã—ã¾ã™ã€‚
+ デフォルト㯠<filename>/</filename> ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Build-options</term>
+<!--
+ <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages,
+ the default is to disable signing and produce all binaries.</para></listitem>
+-->
+ <listitem><para>ã“れらã®ã‚ªãƒ—ションã¯ã€
+ パッケージã®ã‚³ãƒ³ãƒ‘イル時㫠&dpkg-buildpackage; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚
+ デフォルトã§ã¯ã€ç½²åを無効ã«ã—ã€å…¨ãƒã‚¤ãƒŠãƒªã‚’生æˆã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Debug options</title>
+-->
+ <refsect1><title>デãƒãƒƒã‚°ã‚ªãƒ—ション</title>
+<!--
+ <para>Most of the options in the <literal>debug</literal> section are not interesting to
+ the normal user, however <literal>Debug::pkgProblemResolver</literal> shows
+ interesting output about the decisions dist-upgrade makes.
+ <literal>Debug::NoLocking</literal> disables file locking so APT can do some
+ operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the
+ command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will
+ disable the inclusion of statfs data in CDROM IDs.
+ <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+ </para>
+-->
+ <para><literal>debug</literal> ã®å¤šãã®ã‚ªãƒ—ションã¯ã€
+ 普通ã®ãƒ¦ãƒ¼ã‚¶ã«ã¨ã£ã¦èˆˆå‘³ã‚’引ãã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ ã—ã‹ã— <literal>Debug::pkgProblemResolver</literal> ã§ã€
+ dist-upgrade ã®åˆ¤æ–­ã«ã¤ã„ã¦ã®èˆˆå‘³æ·±ã„出力ãŒå¾—られã¾ã™ã€‚
+ <literal>Debug::NoLocking</literal>ã¯ã€
+ APT ãŒéž root ã§æ“作ã§ãるよã†ã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ­ãƒƒã‚¯ã‚’無効ã«ã—ã¾ã™ã—ã€
+ <literal>Debug::pkgDPkgPM</literal>ã¯ã€
+ dpkg を呼ã¶éš›ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚’出力ã—ã¾ã™ã€‚
+ <literal>Debug::IdentCdrom</literal> ã¯ã€
+ CDROM ID ã®çŠ¶æ…‹ãƒ‡ãƒ¼ã‚¿ã®åŒ…å«ã‚’無効ã«ã—ã¾ã™ã€‚
+ <literal>Debug::Acquire::gpgv</literal> gpgv 法ã®ãƒ‡ãƒãƒƒã‚°ã§ã™ã€‚
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>例</title>
+<!--
+ <para>&configureindex; is a
+ configuration file showing example values for all possible
+ options.</para>
+-->
+ <para>&configureindex; ã«ã€å…¨åˆ©ç”¨å¯èƒ½ã‚ªãƒ—ションã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’å‚ç…§ã§ãã‚‹ã€
+ 設定ファイルã®ã‚µãƒ³ãƒ—ルãŒã‚ã‚Šã¾ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <para><filename>/etc/apt/apt.conf</filename></para>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index 495322997..3fa931ae5 100644
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -2,178 +2,327 @@
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
-<!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
+<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
+<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
<!ENTITY cachedir "/var/cache/apt">
<!-- Cross references to other man pages -->
-<!ENTITY apt-conf "<CiteRefEntry>
- <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY apt-get "<CiteRefEntry>
- <RefEntryTitle><command/apt-get/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-config "<CiteRefEntry>
- <RefEntryTitle><command/apt-config/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-cdrom "<CiteRefEntry>
- <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-cache "<CiteRefEntry>
- <RefEntryTitle><command/apt-cache/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-preferences "<CiteRefEntry>
- <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY sources-list "<CiteRefEntry>
- <RefEntryTitle><filename/sources.list/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY reportbug "<CiteRefEntry>
- <RefEntryTitle><command/reportbug/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY dpkg "<CiteRefEntry>
- <RefEntryTitle><command/dpkg/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-buildpackage "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY gzip "<CiteRefEntry>
- <RefEntryTitle><command/gzip/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-scanpackages "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-scansources "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dselect "<CiteRefEntry>
- <RefEntryTitle><command/dselect/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
+<!ENTITY apt-conf "<citerefentry>
+ <refentrytitle><filename>apt.conf</filename></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-get "<citerefentry>
+ <refentrytitle><command>apt-get</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-config "<citerefentry>
+ <refentrytitle><command>apt-config</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-cdrom "<citerefentry>
+ <refentrytitle><command>apt-cdrom</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-cache "<citerefentry>
+ <refentrytitle><command>apt-cache</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-preferences "<citerefentry>
+ <refentrytitle><command>apt_preferences</command></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-key "<citerefentry>
+ <refentrytitle><command>apt-key</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-secure "<citerefentry>
+ <refentrytitle>apt-secure</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-archive "<citerefentry>
+ <refentrytitle><filename>apt-archive</filename></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+
+<!ENTITY sources-list "<citerefentry>
+ <refentrytitle><filename>sources.list</filename></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY reportbug "<citerefentry>
+ <refentrytitle><command>reportbug</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg "<citerefentry>
+ <refentrytitle><command>dpkg</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-buildpackage "<citerefentry>
+ <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY gzip "<citerefentry>
+ <refentrytitle><command>gzip</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-scanpackages "<citerefentry>
+ <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-scansources "<citerefentry>
+ <refentrytitle><command>dpkg-scansources</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dselect "<citerefentry>
+ <refentrytitle><command>dselect</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY aptitude "<citerefentry>
+ <refentrytitle><command>aptitude</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY synaptic "<citerefentry>
+ <refentrytitle><command>synaptic</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY debsign "<citerefentry>
+ <refentrytitle><command>debsign</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY debsig-verify "<citerefentry>
+ <refentrytitle><command>debsig-verify</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY gpg "<citerefentry>
+ <refentrytitle><command>gpg</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
<!-- Boiler plate docinfo section -->
<!ENTITY apt-docinfo "
- <docinfo>
- <address><email>apt@packages.debian.org</></address>
- <author><firstname>Jason</> <surname>Gunthorpe</></>
- <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
- <date>12 March 2001</>
- </docinfo>
+ <refentryinfo>
+ <address><email>apt@packages.debian.org</email></address>
+ <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
+ <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
+ <date>14 December 2003</date>
+ <productname>Linux</productname>
+
+ </refentryinfo>
">
+<!ENTITY apt-email "
+ <address>
+ <email>apt@packages.debian.org</email>
+ </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+ <author>
+ <firstname>Jason</firstname>
+ <surname>Gunthorpe</surname>
+ </author>
+">
+
+<!ENTITY apt-author.team "
+ <author>
+ <othername>APT team</othername>
+ </author>
+">
+
+<!ENTITY apt-product "
+ <productname>Linux</productname>
+">
+
+<!ENTITY apt-email "
+ <address>
+ <email>apt@packages.debian.org</email>
+ </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+ <author>
+ <firstname>Jason</firstname>
+ <surname>Gunthorpe</surname>
+ </author>
+">
+
+<!ENTITY apt-author.team "
+ <author>
+ <othername>APT team</othername>
+ </author>
+">
+
+<!ENTITY apt-copyright "
+ <copyright>
+ <holder>Jason Gunthorpe</holder>
+ <year>1998-2001</year>
+ </copyright>
+">
+
+<!ENTITY apt-product "
+ <productname>Linux</productname>
+">
+
<!-- Boiler plate Bug reporting section -->
<!ENTITY manbugs "
- <RefSect1><Title>¥Ð¥°</>
- <para>
- <ulink url='http://bugs.debian.org/apt'>APT ¥Ð¥°¥Ú¡¼¥¸</>¤ò
- »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢
- <filename>/usr/share/doc/debian/bug-reporting.txt</> ¤ä
- &reportbug; ¥³¥Þ¥ó¥É¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+<!--
+ <refsect1><title>Bugs</title>
+-->
+ <refsect1><title>ãƒã‚°</title>
+<!--
+ <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.
+ If you wish to report a bug in APT, please see
+ <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the
+ &reportbug; command.
</para>
- </RefSect1>
+-->
+ <para><ulink url='http://bugs.debian.org/src:apt'>APT ãƒã‚°ãƒšãƒ¼ã‚¸</ulink>ã‚’
+ ã”覧ãã ã•ã„。
+ APT ã®ãƒã‚°ã‚’報告ã™ã‚‹å ´åˆã¯ã€
+ <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ã‚„
+ &reportbug; コマンドをã”覧ãã ã•ã„。
+ </para>
+ </refsect1>
">
<!-- Boiler plate Author section -->
<!ENTITY manauthor "
- <RefSect1><Title>Ãø¼Ô</>
- <para>
- APT ¤Ï the APT team <email>apt@packages.debian.org</> ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡£
+<!--
+ <refsect1><title>Author</title>
+-->
+ <refsect1><title>著者</title>
+<!--
+ <para>APT was written by the APT team <email>apt@packages.debian.org</email>.
+-->
+ <para>APT 㯠the APT team <email>apt@packages.debian.org</email> ã«ã‚ˆã£ã¦
+ 書ã‹ã‚Œã¾ã—ãŸã€‚
</para>
- </RefSect1>
+ </refsect1>
">
-<!-- Translator section (Kurasawa Add)-->
+<!-- Boiler plate Translator section (nabetaro add)-->
<!ENTITY translator "
- <RefSect1><Title>ËÝÌõ¼Ô</>
- <para>
- ÁÒß· ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004)
- </para>
- <para>
- Debian JP Documentation ML <email>debian-doc@debian.or.jp</>
- </para>
- </RefSect1>
+ <refsect1><title>訳者</title>
+ <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006),
+ Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
+ </para>
+ </refsect1>
">
<!-- Should be used within the option section of the text to
put in the blurb about -h, -v, -c and -o -->
<!ENTITY apt-commonoptions "
- <VarListEntry><term><option/-h/</><term><option/--help/</>
- <ListItem><Para>
- »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
+ <varlistentry><term><option>-h</option></term>
+ <term><option>--help</option></term>
+<!--
+ <listitem><para>Show a short usage summary.
+-->
+ <listitem><para>使ã„æ–¹ã®çŸ­ã„è¦ç´„を表示ã—ã¾ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
- <VarListEntry><term><option/-v/</><term><option/--version/</>
- <ListItem><Para>
- ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-c/</><term><option/--config-file/</>
- <ListItem><Para>
+ <varlistentry>
+ <term><option>-v</option></term>
+ <term><option>--version</option></term>
<!--
- Configuration File; Specify a configuration file to use.
+ <listitem><para>Show the program version.
+-->
+ <listitem><para>プログラムã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¾ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-c</option></term>
+ <term><option>--config-file</option></term>
+<!--
+ <listitem><para>Configuration File; Specify a configuration file to use.
The program will read the default configuration file and then this
configuration file. See &apt-conf; for syntax information.
+ </para>
-->
- ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
- ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
- ʸˡ¤Î¾ðÊó¤Ï &apt-conf; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- </Para></ListItem>
- </VarListEntry>
+ <listitem><para>設定ファイル。 使用ã™ã‚‹è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¾ã™ã€‚
+ ã“ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèª­ã‚ãªã„å ´åˆã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã¾ã™ã€‚
+ 文法ã«ã¤ã„ã¦ã¯ &apt-conf; ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ </para>
+ </listitem>
+ </varlistentry>
- <VarListEntry><term><option/-o/</><term><option/--option/</>
- <ListItem><Para>
+ <varlistentry>
+ <term><option>-o</option></term>
+ <term><option>--option</option></term>
<!--
- Set a Configuration Option; This will set an arbitary configuration
- option. The syntax is <option>-o Foo::Bar=bar</>.
+ <listitem><para>Set a Configuration Option; This will set an arbitary
+ configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
+ </para>
-->
- ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È - Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
- ʸˡ¤Ï <option>-o Foo::Bar=bar</> ¤È¤Ê¤ê¤Þ¤¹¡£
- </Para></ListItem>
- </VarListEntry>
+ <listitem><para>設定オプションã®ã‚»ãƒƒãƒˆã€‚ä»»æ„ã®è¨­å®šã‚ªãƒ—ションをセットã—ã¾ã™ã€‚
+ 文法㯠<option>-o Foo::Bar=bar</option> ã¨ãªã‚Šã¾ã™ã€‚
+ </para>
+ </listitem>
+ </varlistentry>
">
<!-- Should be used within the option section of the text to
put in the blurb about -h, -v, -c and -o -->
<!ENTITY apt-cmdblurb "
- <para>
<!--
- All command line options may be set using the configuration file, the
+ <para>All command line options may be set using the configuration file, the
descriptions indicate the configuration option to set. For boolean
options you can override the config file by using something like
- <option/-f-/,<option/- -no-f/, <option/-f=no/ or several other variations.
+ <option>-f-</option>,<option>-\-no-f</option>, <option>-f=no</option>
+ or several other variations.
+ </para>
-->
- ¤³¤ÎÀâÌÀ¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ï¡¢¤¹¤Ù¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤ÆÀßÄê¤Ç¤­¤Þ¤¹¡£
- ÀßÄê¥Õ¥¡¥¤¥ë¤Ë½ñ¤¤¤¿¿¿µ¶Ãͤò¤È¤ë¥ª¥×¥·¥ç¥ó¤Ï <option/-f-/,<option/--no-f/,
- <option/-f=no/ ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+ <para>ã“ã®èª¬æ˜Žã§ç¤ºã—ãŸã‚ªãƒ—ションã¯ã€
+ ã™ã¹ã¦è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—ã¦è¨­å®šã§ãã¾ã™ã€‚
+ 設定ファイルã«æ›¸ã„ãŸçœŸå½å€¤ã‚’ã¨ã‚‹ã‚ªãƒ—ションã¯
+ <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>
+ ãªã©ã®ã‚ˆã†ã«ã—ã¦ä¸Šæ›¸ãã§ãã¾ã™ã€‚
</para>
">
+
diff --git a/doc/ja/apt_preferences.ja.5.xml b/doc/ja/apt_preferences.ja.5.xml
new file mode 100644
index 000000000..a7e63a961
--- /dev/null
+++ b/doc/ja/apt_preferences.ja.5.xml
@@ -0,0 +1,940 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt_preferences</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt_preferences</refname>
+<!--
+ <refpurpose>Preference control file for APT</refpurpose>
+-->
+ <refpurpose>APT 設定制御ファイル</refpurpose>
+ </refnamediv>
+
+<refsect1>
+<!--
+<title>Description</title>
+-->
+<title>説明</title>
+<!--
+<para>The APT preferences file <filename>/etc/apt/preferences</filename>
+can be used to control which versions of packages will be selected
+for installation.</para>
+-->
+<para>APT 設定ファイル <filename>/etc/apt/preferences</filename> ã¯ã€
+インストールã™ã‚‹ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³é¸æŠžã‚’制御ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚</para>
+
+<!--
+<para>Several versions of a package may be available for installation when
+the &sources-list; file contains references to more than one distribution
+(for example, <literal>stable</literal> and <literal>testing</literal>).
+APT assigns a priority to each version that is available.
+Subject to dependency constraints, <command>apt-get</command> selects the
+version with the highest priority for installation.
+The APT preferences file overrides the priorities that APT assigns to
+package versions by default, thus giving the user control over which
+one is selected for installation.</para>
+-->
+<para>&sources-list; ファイルã«è¤‡æ•°ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューション
+(<literal>stable</literal> 㨠<literal>testing</literal> ãªã©)
+ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¦ã€
+パッケージã«å¯¾ã—複数ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚
+ã“ã®ã¨ã APT ã¯ã€åˆ©ç”¨ã§ãã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã”ã¨ã«å„ªå…ˆåº¦ã‚’割り当ã¦ã¾ã™ã€‚
+ä¾å­˜é–¢ä¿‚è¦å‰‡ã‚’æ¡ä»¶ã¨ã—ã¦ã€<command>apt-get</command> ã¯ã€
+最も高ã„優先度をæŒã¤ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’インストールã™ã‚‹ã‚ˆã†é¸æŠžã—ã¾ã™ã€‚
+APT 設定ファイルã¯ã€APT ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§å‰²ã‚Šå½“ã¦ãŸã€
+パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ã‚’上書ãã—ã¾ã™ã€‚
+ãã®çµæžœã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚‚ã®ã®é¸æŠžã‚’ã€ãƒ¦ãƒ¼ã‚¶ãŒé¸æŠžã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚</para>
+
+<!--
+<para>Several instances of the same version of a package may be available when
+the &sources-list; file contains references to more than one source.
+In this case <command>apt-get</command> downloads the instance listed
+earliest in the &sources-list; file.
+The APT preferences file does not affect the choice of instance, only
+the choice of version.</para>
+-->
+<para>&sources-list; ファイルã«è¤‡æ•°ã®å‚ç…§ãŒæ›¸ã‹ã‚Œã¦ã„ã‚‹å ´åˆã€
+パッケージã®åŒã˜ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãŒè¤‡æ•°åˆ©ç”¨ã§ãã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ã“ã®å ´åˆã€<command>apt-get</command> 㯠&sources-list;
+ファイルã®åˆã‚ã®æ–¹ã«æŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã¨ã“ã‚ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ã¾ã™ã€‚
+APT 設定ファイルã¯ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®é¸æŠžã«ã®ã¿å½±éŸ¿ã—ã€
+インスタンスã®é¸æŠžã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。</para>
+
+<!--
+<refsect2><title>APT's Default Priority Assignments</title>
+-->
+<refsect2><title>APT ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå„ªå…ˆåº¦ã®å‰²ã‚Šå½“ã¦</title>
+
+<!--
+<para>If there is no preferences file or if there is no entry in the file
+that applies to a particular version then the priority assigned to that
+version is the priority of the distribution to which that version
+belongs. It is possible to single out a distribution, "the target release",
+which receives a higher priority than other distributions do by default.
+The target release can be set on the <command>apt-get</command> command
+line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>.
+For example,
+-->
+<para>設定ファイルãŒãªã‹ã£ãŸã‚Šã€
+設定ファイルã«ã€ç‰¹å®šã®ãƒ‘ッケージを割り当ã¦ã‚‹ã‚¨ãƒ³ãƒˆãƒªãŒãªã„å ´åˆã€
+ãã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ã¯ã€
+ãã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå±žã—ã¦ã„るディストリビューションã®å„ªå…ˆåº¦ã¨ãªã‚Šã¾ã™ã€‚
+デフォルトã§ä»–ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションより高ã„優先度をæŒã¤ã€
+特定ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションを「ターゲットリリースã€ã¨ã—ã¦ãŠãã®ã¯å¯èƒ½ã§ã™ã€‚
+ターゲットリリースã¯ã€<command>apt-get</command> ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§è¨­å®šã—ãŸã‚Šã€
+APT 設定ファイル <filename>/etc/apt/apt.conf</filename> ã§è¨­å®šã—ãŸã‚Šã§ãã¾ã™ã€‚
+例ãˆã°ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚
+
+<programlisting>
+<command>apt-get install -t testing <replaceable>some-package</replaceable></command>
+</programlisting>
+<programlisting>
+APT::Default-Release "stable";
+</programlisting>
+</para>
+
+<!--
+<para>If the target release has been specified then APT uses the following
+algorithm to set the priorities of the versions of a package. Assign:
+-->
+<para>ターゲットリリースãŒæŒ‡å®šã•ã‚Œã‚‹ã¨ã€APT ã¯ä»¥ä¸‹ã®ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã§ã€
+パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ã‚’設定ã—ã¾ã™ã€‚ã“ã®ã‚ˆã†ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚
+
+<variablelist>
+<varlistentry>
+<!--
+<term>priority 100</term>
+-->
+<term>優先度 100</term>
+<!--
+<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
+-->
+<listitem><simpara>(ã‚ã‚‹ãªã‚‰ã°) æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 500</term>
+-->
+<term>優先度 500</term>
+<!--
+<listitem><simpara>to the versions that are not installed and do not belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールã•ã‚Œã¦ãŠã‚‰ãšã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒªãƒªãƒ¼ã‚¹ã«å«ã¾ã‚Œãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 990</term>
+-->
+<term>優先度 990</term>
+<!--
+<listitem><simpara>to the versions that are not installed and belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールã•ã‚Œã¦ãŠã‚‰ãšã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒªãƒªãƒ¼ã‚¹ã«å«ã¾ã‚Œã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If the target release has not been specified then APT simply assigns
+priority 100 to all installed package versions and priority 500 to all
+uninstalled package versions.</para>
+-->
+<para>ターゲットリリースãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€
+APT ã¯å˜ç´”ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã„るパッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ 100 ã‚’ã€
+インストールã—ã¦ã„ãªã„パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ 500 を割り当ã¦ã¾ã™ã€‚</para>
+
+<!--
+<para>APT then applies the following rules, listed in order of precedence,
+to determine which version of a package to install.
+-->
+<para>APT ã¯ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’決定ã™ã‚‹ãŸã‚ã«ã€
+以下ã®ãƒ«ãƒ¼ãƒ«ã‚’上ã‹ã‚‰é †ç•ªã«é©ç”¨ã—ã¾ã™ã€‚
+<itemizedlist>
+<!--
+<listitem><simpara>Never downgrade unless the priority of an available
+version exceeds 1000. ("Downgrading" is installing a less recent version
+of a package in place of a more recent version. Note that none of APT's
+default priorities exceeds 1000; such high priorities can only be set in
+the preferences file. Note also that downgrading a package
+can be risky.)</simpara></listitem>
+-->
+<listitem><simpara>有効ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ãŒ 1000 を越ãˆãªã„å ´åˆã€
+決ã—ã¦ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¾ã›ã‚“。
+(「ダウングレードã€ã¯ã€ç¾åœ¨ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ˆã‚Šã‚‚ã€
+å°ã•ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚‚ã®ã‚’インストールã—ã¾ã™ã€‚
+APT ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå„ªå…ˆåº¦ãŒ 1000 を越ãˆãªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ãã®ã‚ˆã†ãªå„ªå…ˆåº¦ã¯è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã®ã¿è¨­å®šã§ãã¾ã™ã€‚
+ã¾ãŸã€ãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã¯å±é™ºã§ã‚ã‚‹ã“ã¨ã«ã‚‚注æ„ã—ã¦ãã ã•ã„)</simpara></listitem>
+<!--
+<listitem><simpara>Install the highest priority version.</simpara></listitem>
+-->
+<listitem><simpara>最も高ã„優先度ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’インストールã—ã¾ã™ã€‚</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority,
+install the most recent one (that is, the one with the higher version
+number).</simpara></listitem>
+-->
+<listitem><simpara>åŒã˜å„ªå…ˆåº¦ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¤‡æ•°å­˜åœ¨ã™ã‚‹å ´åˆã€
+最も新ã—ã„ã‚‚ã® (最もãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒé«˜ã„ã‚‚ã®) をインストールã—ã¾ã™ã€‚</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority and
+version number but either the packages differ in some of their metadata or the
+<literal>-\-reinstall</literal> option is given, install the uninstalled one.</simpara></listitem>
+-->
+<listitem><simpara>優先度・ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒåŒã˜ã‚‚ã®ãŒè¤‡æ•°å­˜åœ¨ã—ã€
+ãã®ãƒ‘ッケージã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ãŒç•°ãªã‚‹ã‹ <literal>--reinstall</literal>
+オプションãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã€
+インストールã•ã‚Œã¦ã„ãªã„ã‚‚ã®ã‚’インストールã—ã¾ã™ã€‚</simpara></listitem>
+</itemizedlist>
+</para>
+
+<!--
+<para>In a typical situation, the installed version of a package (priority 100)
+is not as recent as one of the versions available from the sources listed in
+the &sources-list; file (priority 500 or 990). Then the package will be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.
+-->
+<para>よãã‚る状æ³ã¨ã—ã¦ã€
+ã‚るインストールã•ã‚Œã¦ã„るパッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ (優先度 100) ãŒã€
+&sources-list; ファイルã®ãƒªã‚¹ãƒˆã‹ã‚‰å¾—られるãƒãƒ¼ã‚¸ãƒ§ãƒ³ (優先度 500 ã‹ 990)
+よりも新ã—ããªã„ã¨ã„ã†ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®å ´åˆã€
+<command>apt-get install <replaceable>some-package</replaceable></command>
+ã‚„ <command>apt-get upgrade</command> を実行ã™ã‚‹ã¨ãƒ‘ッケージãŒæ›´æ–°ã•ã‚Œã¾ã™ã€‚
+</para>
+
+<!--
+<para>More rarely, the installed version of a package is <emphasis>more</emphasis> recent
+than any of the other available versions. The package will not be downgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.</para>
+-->
+<para>ã¾ã‚Œã«ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„るパッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã€
+<emphasis>ä»–ã®æœ‰åŠ¹ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ˆã‚Šã‚‚</emphasis>æ–°ã—ã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚
+ã“ã®æ™‚
+<command>apt-get install <replaceable>some-package</replaceable></command>
+ã‚„ <command>apt-get upgrade</command> を実行ã—ã¦ã‚‚ã€
+ダウングレードã—ã¾ã›ã‚“。</para>
+
+<!--
+<para>Sometimes the installed version of a package is more recent than the
+version belonging to the target release, but not as recent as a version
+belonging to some other distribution. Such a package will indeed be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed,
+because at least <emphasis>one</emphasis> of the available versions has a higher
+priority than the installed version.</para>
+-->
+<para>時々ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã„るパッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã€
+ターゲットリリースã«å±žã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ˆã‚Šã‚‚æ–°ã—ãã€
+ä»–ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションよりもå¤ã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚
+ãã®ã‚ˆã†ãªãƒ‘ッケージã«å¯¾ã—ã¦
+<command>apt-get install <replaceable>some-package</replaceable></command>
+ã‚„ <command>apt-get upgrade</command> を実行ã™ã‚‹ã¨ã€
+パッケージã¯æ›´æ–°ã•ã‚Œã¾ã™ã€‚
+ã“ã®å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ˆã‚Šã‚‚ã€
+å°‘ãªãã¨ã‚‚<emphasis>ã²ã¨ã¤</emphasis>ã¯ã€
+高ã„優先度をæŒã¤æœ‰åŠ¹ãªãƒ‘ッケージãŒã‚ã‚‹ã‹ã‚‰ã§ã™ã€‚</para>
+</refsect2>
+
+<!--
+<refsect2><title>The Effect of APT Preferences</title>
+-->
+<refsect2><title>APT 設定ã®åŠ¹æžœ</title>
+
+<!--
+<para>The APT preferences file allows the system administrator to control the
+assignment of priorities. The file consists of one or more multi-line records
+separated by blank lines. Records can have one of two forms, a specific form
+and a general form.
+-->
+<para>APT 設定ファイルを使ã†ã¨ã€
+システム管ç†è€…ãŒå„ªå…ˆåº¦ã‚’割り当ã¦ã‚‰ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚
+ファイルã¯ã€ç©ºç™½è¡Œã§åŒºåˆ‡ã‚‰ã‚ŒãŸã€è¤‡æ•°è¡Œã‹ã‚‰ãªã‚‹ãƒ¬ã‚³ãƒ¼ãƒ‰ã§æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+レコードã¯ç‰¹å®šå½¢å¼ã‹ã€æ±Žç”¨å½¢å¼ã®ã©ã¡ã‚‰ã‹ã®å½¢å¼ã‚’ã¨ã‚Šã¾ã™ã€‚
+<itemizedlist>
+<listitem>
+<!--
+<simpara>The specific form assigns a priority (a "Pin-Priority") to a
+specified package and specified version or version range. For example,
+the following record assigns a high priority to all versions of
+the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara>
+-->
+<simpara>特定形å¼ã¯ã€å„ªå…ˆåº¦ ("Pin-Priority") ã‚’ã€
+指定ã—ãŸãƒ‘ッケージã®æŒ‡å®šã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ (範囲) ã«ã¤ã„ã¦å‰²ã‚Šå½“ã¦ã¾ã™ã€‚
+例ãˆã°ä»¥ä¸‹ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã¯ã€
+"<literal>5.8</literal>" ã§å§‹ã¾ã‚‹ <filename>perl</filename> パッケージをã€
+高ã„優先度ã«è¨­å®šã—ã¾ã™ã€‚</simpara>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+</programlisting>
+</listitem>
+
+<!--
+<listitem><simpara>The general form assigns a priority to all of the package versions in a
+given distribution (that is, to all the versions of packages that are
+listed in a certain <filename>Release</filename> file) or to all of the package
+versions coming from a particular Internet site, as identified by the
+site's fully qualified domain name.</simpara>
+-->
+<listitem><simpara>汎用形å¼ã¯ã€ä¸Žãˆã‚‰ã‚ŒãŸãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«ã‚ã‚‹ã€
+ã™ã¹ã¦ã®ãƒ‘ッケージ (<filename>Release</filename> ファイルã«åˆ—挙ã—ãŸãƒ‘ッケージ)
+ã®å„ªå…ˆåº¦ã‚„ã€FQDNã§æŒ‡å®šã—ãŸã€
+特定ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µã‚¤ãƒˆã‹ã‚‰å–å¾—ã™ã‚‹ãƒ‘ッケージã®å„ªå…ˆåº¦ã‚’割り当ã¦ã¾ã™ã€‚</simpara>
+
+<!--
+<simpara>This general-form entry in the APT preferences file applies only
+to groups of packages. For example, the following record assigns a high
+priority to all package versions available from the local site.</simpara>
+-->
+<simpara>APT 設定ファイルã«æ›¸ã‹ã‚Œã¦ã„る汎用形å¼ã®ã‚¨ãƒ³ãƒˆãƒªã¯ã€
+パッケージã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã¤ã„ã¦ã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚
+例ãˆã°ä»¥ä¸‹ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã¯ã€ãƒ­ãƒ¼ã‚«ãƒ«ã‚µã‚¤ãƒˆã«ã‚る全パッケージã«ã¤ã„ã¦ã€
+高ã„優先度を割り当ã¦ã¾ã™ã€‚</simpara>
+
+<programlisting>
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+</programlisting>
+
+<!--
+<simpara>A note of caution: the keyword used here is "<literal>origin</literal>".
+This should not be confused with the Origin of a distribution as
+specified in a <filename>Release</filename> file. What follows the "Origin:" tag
+in a <filename>Release</filename> file is not an Internet address
+but an author or vendor name, such as "Debian" or "Ximian".</simpara>
+-->
+<simpara>注: ã“ã“ã§ä½¿ç”¨ã—ã¦ã„るキーワード㯠"<literal>origin</literal>" ã§ã™ã€‚
+<filename>Release</filename> ファイルã«æŒ‡å®šã•ã‚ŒãŸã‚ˆã†ãªã€
+ディストリビューション㮠Origin ã¨æ··åŒã—ãªã„よã†ã«ã—ã¦ãã ã•ã„。
+<filename>Release</filename> ファイルã«ã‚ã‚‹ "Origin:" ã‚¿ã‚°ã¯ã€
+インターãƒãƒƒãƒˆã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ãªãã€
+"Debian" ã‚„ "Ximian" ã¨ã„ã£ãŸä½œè€…やベンダåã§ã™ã€‚</simpara>
+
+<!--
+<simpara>The following record assigns a low priority to all package versions
+belonging to any distribution whose Archive name is "<literal>unstable</literal>".</simpara>
+-->
+<simpara>以下ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–å㌠"<literal>unstable</literal>"
+ã¨ãªã£ã¦ã„るディストリビューションã«å±žã™ã‚‹ãƒ‘ッケージをã€
+ã™ã¹ã¦ä½Žã„優先度ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<simpara>The following record assigns a high priority to all package versions
+belonging to any release whose Archive name is "<literal>stable</literal>"
+and whose release Version number is "<literal>3.0</literal>".</simpara>
+-->
+<simpara>以下ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–å㌠"<literal>stable</literal>" ã§ã€
+リリースãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒ "<literal>3.0</literal>"
+ã¨ãªã£ã¦ã„るリリースã«å±žã™ã‚‹ãƒ‘ッケージをã€
+ã™ã¹ã¦é«˜ã„優先度ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=stable, v=3.0
+Pin-Priority: 500
+</programlisting>
+</listitem>
+</itemizedlist>
+</para>
+
+</refsect2>
+
+<refsect2>
+<!--
+<title>How APT Interprets Priorities</title>
+-->
+<title>APT ãŒå„ªå…ˆåº¦ã«å‰²ã‚Šè¾¼ã‚€æ–¹æ³•</title>
+
+<para>
+<!--
+Priorities (P) assigned in the APT preferences file must be positive
+or negative integers. They are interpreted as follows (roughly speaking):
+-->
+APT 設定ファイルã§å‰²ã‚Šå½“ã¦ãŸå„ªå…ˆåº¦ (P) ã¯ã€æ­£è² ã®æ•´æ•°ã§ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“。
+ã“れ㯠(ãŠãŠã–ã£ã±ã«ã„ã†ã¨) 以下ã®ã‚ˆã†ã«è§£é‡ˆã•ã‚Œã¾ã™ã€‚
+
+<variablelist>
+<varlistentry>
+<term>P &gt; 1000</term>
+<!--
+<listitem><simpara>causes a version to be installed even if this
+constitutes a downgrade of the package</simpara></listitem>
+-->
+<listitem><simpara>パッケージãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>990 &lt; P &lt;=1000</term>
+<!--
+<listitem><simpara>causes a version to be installed
+even if it does not come from the target release,
+unless the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>インストールã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ–¹ãŒæ–°ã—ã„ã“ã¨ã‚’除ãã€
+ターゲットリリースã«å«ã¾ã‚Œãªãã¦ã‚‚ã€
+ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>500 &lt; P &lt;=990</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to the target release
+or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>ターゲットリリースã«å±žã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã£ãŸã‚Šã€
+インストールã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ–¹ãŒæ–°ã—ã„ã®ã§ãªã‘ã‚Œã°ã€
+ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>100 &lt; P &lt;=500</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to some other
+distribution or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>ä»–ã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã«å±žã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã£ãŸã‚Šã€
+インストールã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ–¹ãŒæ–°ã—ã„ã®ã§ãªã‘ã‚Œã°ã€
+ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>0 &lt; P &lt;=100</term>
+<!--
+<listitem><simpara>causes a version to be installed
+only if there is no installed version of the package</simpara></listitem>
+-->
+<listitem><simpara>ã“ã®ãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€
+ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストールã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>P &lt; 0</term>
+<!--
+<listitem><simpara>prevents the version from being installed</simpara></listitem>
+-->
+<listitem><simpara>ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œãªã„よã†ã«ã—ã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If any specific-form records match an available package version then the
+first such record determines the priority of the package version.
+Failing that,
+if any general-form records match an available package version then the
+first such record determines the priority of the package version.</para>
+-->
+<para>特定形å¼ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒåˆ©ç”¨å¯èƒ½ãƒ‘ッケージãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ä¸€è‡´ã—ãŸå ´åˆã€
+最åˆã®ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒã€ãƒ‘ッケージãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ã‚’決定ã—ã¾ã™ã€‚
+失敗ã—ã¦ã€æ±Žç”¨å½¢å¼ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒåˆ©ç”¨å¯èƒ½ãƒ‘ッケージãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ä¸€è‡´ã—ãŸå ´åˆã€
+最åˆã®ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒã€ãƒ‘ッケージãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å„ªå…ˆåº¦ã‚’決定ã—ã¾ã™ã€‚</para>
+
+<!--
+<para>For example, suppose the APT preferences file contains the three
+records presented earlier:</para>
+-->
+<para>例ãˆã°ã€APT 設定ファイルã®ä¸Šã®æ–¹ã«ã€
+以下ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒæ›¸ã‹ã‚Œã¦ã„ã‚‹ã¨ä»®å®šã—ã¦ãã ã•ã„。</para>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+
+Package: *
+Pin: release unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<para>Then:
+-->
+<para>ã™ã‚‹ã¨ã€
+<itemizedlist>
+<!--
+<listitem><simpara>The most recent available version of the <literal>perl</literal>
+package will be installed, so long as that version's version number begins
+with "<literal>5.8</literal>". If <emphasis>any</emphasis> 5.8* version of <literal>perl</literal> is
+available and the installed version is 5.9*, then <literal>perl</literal> will be
+downgraded.</simpara></listitem>
+-->
+<listitem><simpara>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒ "<literal>5.8</literal>" ã§å§‹ã¾ã£ã¦ã„ã‚Œã°ã€
+<literal>perl</literal> ã®æœ€æ–°ã®åˆ©ç”¨å¯èƒ½ãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 5.8* ãŒåˆ©ç”¨å¯èƒ½ã§ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 5.9* ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹å ´åˆã€
+<literal>perl</literal> ã¯ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã•ã‚Œã¾ã™ã€‚</simpara></listitem>
+<!--
+<listitem><simpara>A version of any package other than <literal>perl</literal>
+that is available from the local system has priority over other versions,
+even versions belonging to the target release.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムã§æœ‰åŠ¹ãªã€
+<literal>perl</literal> 以外ã®ã©ã‚“ãªãƒ‘ッケージã§ã‚‚ã€
+ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚ˆã‚Š (ãŸã¨ãˆã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒªãƒªãƒ¼ã‚¹ã«å±žã—ã¦ã„ã¦ã‚‚) 優先度ãŒé«˜ããªã‚Šã¾ã™ã€‚
+</simpara></listitem>
+<!--
+<listitem><simpara>A version of a package whose origin is not the local
+system but some other site listed in &sources-list; and which belongs to
+an <literal>unstable</literal> distribution is only installed if it is selected
+for installation and no version of the package is already installed.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムã«ã¯ãªãã¦ã‚‚ &sources-list;
+ã«åˆ—挙ã•ã‚ŒãŸã‚µã‚¤ãƒˆã«ã‚ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã€
+<literal>unstable</literal> ディストリビューションã«å±žã—ã¦ã„るパッケージã¯ã€
+インストールã™ã‚‹ã‚ˆã†é¸æŠžã•ã‚Œã€
+æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒãªã„å ´åˆã«ã®ã¿ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+</simpara></listitem>
+</itemizedlist>
+</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Determination of Package Version and Distribution Properties</title>
+-->
+<title>パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションプロパティã®æ±ºå®š</title>
+
+<!--
+<para>The locations listed in the &sources-list; file should provide
+<filename>Packages</filename> and <filename>Release</filename> files
+to describe the packages available at that location. </para>
+-->
+<para>&sources-list; ファイルã«åˆ—挙ã—ãŸå ´æ‰€ã§ã¯ã€
+ãã®å ´æ‰€ã§åˆ©ç”¨ã§ãるパッケージを記述ã—ãŸã€
+<filename>Packages</filename> ファイルや
+<filename>Release</filename> ファイルをæä¾›ã—ã¾ã™ã€‚</para>
+
+<!--
+<para>The <filename>Packages</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>:
+for example, <filename>.../dists/stable/main/binary-i386/Packages</filename>.
+It consists of a series of multi-line records, one for each package available
+in that directory. Only two lines in each record are relevant for setting
+APT priorities:
+-->
+<para><filename>Packages</filename> ファイルã¯é€šå¸¸
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>
+ディレクトリã«ã‚ã‚Šã¾ã™ã€‚
+例ãˆã°ã€<filename>.../dists/stable/main/binary-i386/Packages</filename> ã§ã™ã€‚
+ã“ã‚Œã¯ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚る利用å¯èƒ½ãƒ‘ッケージã”ã¨ã«ã€
+複数行ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã‹ã‚‰ã§ãã¦ã„ã¾ã™ã€‚
+APT 優先度ã®è¨­å®šã¯ã€ãƒ¬ã‚³ãƒ¼ãƒ‰ã”ã¨ã«ä»¥ä¸‹ã® 2 è¡Œã ã‘ã§ã™ã€‚
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Package:</literal> line</term>
+<listitem><simpara>gives the package name</simpara></listitem>
+-->
+<term><literal>Package:</literal> 行</term>
+<listitem><simpara>パッケージåを与ãˆã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+<listitem><simpara>gives the version number for the named package</simpara></listitem>
+-->
+<term><literal>Version:</literal> 行</term>
+<listitem><simpara>ãã®åå‰ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã‚’与ãˆã¾ã™ã€‚</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>The <filename>Release</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable></filename>:
+for example, <filename>.../dists/stable/Release</filename>,
+or <filename>.../dists/woody/Release</filename>.
+It consists of a single multi-line record which applies to <emphasis>all</emphasis> of
+the packages in the directory tree below its parent. Unlike the
+<filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename>
+file are relevant for setting APT priorities:
+-->
+<para><filename>Release</filename> ファイルã¯ã€é€šå¸¸
+<filename>.../dists/<replaceable>dist-name</replaceable></filename>
+ã«ã‚ã‚Šã¾ã™ã€‚例ãˆã°ã€
+<filename>.../dists/stable/Release</filename>,
+<filename>.../dists/woody/Release</filename> ã§ã™ã€‚
+ã“ã‚Œã¯ã€ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä»¥ä¸‹ã«ã‚ã‚‹<emphasis>å…¨</emphasis>パッケージã«é©ç”¨ã™ã‚‹ã€
+複数行ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ 1 ã¤ã‹ã‚‰æˆã£ã¦ã„ã¾ã™ã€‚
+<filename>Packages</filename> ã¨é•ã„ <filename>Release</filename> ファイルã¯ã€
+ã»ã¨ã‚“ã©ã®è¡ŒãŒ APT 優先度ã®è¨­å®šã«é–¢é€£ã—ã¾ã™ã€‚
+
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Archive:</literal> line</term>
+-->
+<term><literal>Archive:</literal> 行</term>
+<!--
+<listitem><simpara>names the archive to which all the packages
+in the directory tree belong. For example, the line
+"Archive: stable"
+specifies that all of the packages in the directory
+tree below the parent of the <filename>Release</filename> file are in a
+<literal>stable</literal> archive. Specifying this value in the APT preferences file
+would require the line:
+-->
+<listitem><simpara>ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ„リーã«å±žã™ã‚‹å…¨ãƒ‘ッケージã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–å。
+例ãˆã°ã€
+"Archive: stable"
+ã¨ã„ã†è¡Œã¯ã€<filename>Release</filename> ファイルã®è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ„リー以下ã«ã‚る全パッケージãŒã€
+<literal>stable</literal> アーカイブã ã¨æŒ‡å®šã—ã¾ã™ã€‚
+APT 設定ファイルã§ã“ã®å€¤ã‚’指定ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®è¡ŒãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+</simpara>
+<programlisting>
+Pin: release a=stable
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+-->
+<term><literal>Version:</literal> 行</term>
+<!--
+<listitem><simpara>names the release version. For example, the
+packages in the tree might belong to Debian GNU/Linux release
+version 3.0. Note that there is normally no version number for the
+<literal>testing</literal> and <literal>unstable</literal> distributions because they
+have not been released yet. Specifying this in the APT preferences
+file would require one of the following lines.
+-->
+<listitem><simpara>リリースãƒãƒ¼ã‚¸ãƒ§ãƒ³å。
+例ãˆã°ã€ã“ã®ãƒ„リーã®ãƒ‘ッケージãŒã€
+GNU/Linux リリースãƒãƒ¼ã‚¸ãƒ§ãƒ³ 3.0 ã«å±žã™ã‚‹ã¨ã—ã¾ã™ã€‚
+通常 <literal>testing</literal> ディストリビューションや
+<literal>unstable</literal> ディストリビューションã«ã¯ã€
+ã¾ã ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¦ã„ãªã„ã®ã§ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ãŒä»˜ãã¾ã›ã‚“。
+APT 設定ファイルã§ã“れを指定ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®è¡Œã®ã„ãšã‚Œã‹ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+</simpara>
+
+<programlisting>
+Pin: release v=3.0
+Pin: release a=stable, v=3.0
+Pin: release 3.0
+</programlisting>
+
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Component:</literal> line</term>
+-->
+<term><literal>Component:</literal> 行</term>
+<!--
+<listitem><simpara>names the licensing component associated with the
+packages in the directory tree of the <filename>Release</filename> file.
+For example, the line "Component: main" specifies that
+all the packages in the directory tree are from the <literal>main</literal>
+component, which entails that they are licensed under terms listed
+in the Debian Free Software Guidelines. Specifying this component
+in the APT preferences file would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルã®ã€
+ディレクトリツリーã«ã‚るパッケージã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆå。
+例ãˆã°ã€"Component: main" ã¨ã„ã†è¡Œã¯ã€ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä»¥ä¸‹ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€
+<literal>main</literal> コンãƒãƒ¼ãƒãƒ³ãƒˆ
+(Debian フリーソフトウェアガイドラインã®å…ƒã§ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã•ã‚Œã¦ã„ã‚‹)
+ã§ã‚ã‚‹ã“ã¨ã‚’表ã—ã¾ã™ã€‚
+APT 設定ファイルã§ã“ã®ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’指定ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®è¡ŒãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+</simpara>
+<programlisting>
+Pin: release c=main
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Origin:</literal> line</term>
+-->
+<term><literal>Origin:</literal> 行</term>
+<!--
+<listitem><simpara>names the originator of the packages in the
+directory tree of the <filename>Release</filename> file. Most commonly, this is
+<literal>Debian</literal>. Specifying this origin in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ„リーã«ã‚るパッケージã®æ供者å。
+ã»ã¨ã‚“ã©å…±é€šã§ã€<literal>Debian</literal> ã§ã™ã€‚
+APT 設定ファイルã§ã“ã®æ供者を指定ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®è¡ŒãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+</simpara>
+<programlisting>
+Pin: release o=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Label:</literal> line</term>
+-->
+<term><literal>Label:</literal> 行</term>
+<!--
+<listitem><simpara>names the label of the packages in the directory tree
+of the <filename>Release</filename> file. Most commonly, this is
+<literal>Debian</literal>. Specifying this label in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ„リーã«ã‚るパッケージã®ãƒ©ãƒ™ãƒ«å。
+ã»ã¨ã‚“ã©å…±é€šã§ <literal>Debian</literal> ã§ã™ã€‚
+APT 設定ファイルã§ã“ã®ãƒ©ãƒ™ãƒ«ã‚’指定ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã®è¡ŒãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚
+</simpara>
+<programlisting>
+Pin: release l=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>All of the <filename>Packages</filename> and <filename>Release</filename>
+files retrieved from locations listed in the &sources-list; file are stored
+in the directory <filename>/var/lib/apt/lists</filename>, or in the file named
+by the variable <literal>Dir::State::Lists</literal> in the <filename>apt.conf</filename> file.
+For example, the file
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename>
+contains the <filename>Release</filename> file retrieved from the site
+<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> architecture
+files from the <literal>contrib</literal> component of the <literal>unstable</literal>
+distribution.</para>
+-->
+<para>&sources-list; ファイルã«åˆ—挙ã•ã‚ŒãŸå ´æ‰€ã‹ã‚‰å–å¾—ã—ãŸ
+<filename>Packages</filename> ファイルや
+<filename>Release</filename> ファイルã¯ã™ã¹ã¦ã€
+<filename>/var/lib/apt/lists</filename> ディレクトリやã€
+<filename>apt.conf</filename> ファイルã®
+<literal>Dir::State::Lists</literal> 変数ã§æŒ‡å®šã—ãŸå ´æ‰€ã«å–å¾—ã•ã‚Œã¾ã™ã€‚例ãˆã°ã€
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルã¯ã€
+<literal>debian.lcs.mit.edu</literal> ã‹ã‚‰å–å¾—ã—ãŸã€
+<literal>unstable</literal> ディストリビューションã§ã€
+<literal>contrib</literal> コンãƒãƒ¼ãƒãƒ³ãƒˆãªã€
+<literal>binary-i386</literal> アーキテクãƒãƒ£ç”¨ã®
+<filename>Release</filename> ファイルをå«ã‚“ã§ã„ã¾ã™ã€‚</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Optional Lines in an APT Preferences Record</title>
+-->
+<title>APT 設定レコードã®ã‚ªãƒ—ション行</title>
+
+<!--
+<para>Each record in the APT preferences file can optionally begin with
+one or more lines beginning with the word <literal>Explanation:</literal>.
+This provides a place for comments.</para>
+-->
+<para>APT 設定ファイルã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã”ã¨ã«ã€
+ä»»æ„㧠<literal>Explanation:</literal> ã§å§‹ã¾ã‚‹è¡Œã‚’æŒã¦ã¾ã™ã€‚
+ã“ã‚Œã¯ã€ã‚³ãƒ¡ãƒ³ãƒˆç”¨ã®å ´æ‰€ã‚’確ä¿ã—ã¾ã™ã€‚</para>
+
+<!--
+<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is
+optional. If omitted, APT assigs a priority of 1 less than the last value
+specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para>
+-->
+<para>APT 設定レコード㮠<literal>Pin-Priority:</literal> è¡Œã¯ä»»æ„ã§ã™ã€‚
+çœç•¥ã™ã‚‹ã¨ã€<literal>Pin-Priority: release ...</literal>
+ã§å§‹ã¾ã‚‹è¡Œã§æŒ‡ç¤ºã—ãŸæœ€å¾Œã®å€¤ (å°‘ãªãã¨ã‚‚1ã¤) を優先度ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚</para>
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>Examples</title>
+-->
+<title>サンプル</title>
+<refsect2>
+<!--
+<title>Tracking Stable</title>
+-->
+<title>安定版を追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign a
+priority higher than the default (500) to all package versions belonging
+to a <literal>stable</literal> distribution and a prohibitively low priority to
+package versions belonging to other <literal>Debian</literal> distributions.
+-->
+<para>以下㮠APT 設定ファイルã¯ã€<literal>stable</literal>
+ディストリビューションã«å±žã™ã‚‹å…¨ã¦ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã€
+デフォルト (500) より高ã„優先度を割り当ã¦ã€
+ä»–ã® <literal>Debian</literal>
+ディストリビューションã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ã€
+低ãã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ããªã„よã†ãªå„ªå…ˆåº¦ã‚’割り当ã¦ã¾ã™ã€‚
+
+<programlisting>
+Explanation: Uninstall or do not install any Debian-originated
+Explanation: package versions other than those in the stable distro
+Package: *
+Pin: release a=stable
+Pin-Priority: 900
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the
+latest <literal>stable</literal> version(s).
+-->
+<para>é©åˆ‡ãª &sources-list; ファイルã¨ä¸Šè¨˜ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚Šã€
+以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§æœ€æ–°ã® <literal>stable</literal>
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã§ãã¾ã™ã€‚
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>testing</literal> distribution;
+the package will not be upgraded again unless this command is given
+again.
+-->
+<para>以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã€æŒ‡å®šã—ãŸãƒ‘ッケージを <literal>testing</literal>
+ディストリビューションã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚
+ã“ã®ãƒ‘ッケージã¯ã€å†åº¦ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’発行ã—ãªã„ã¨ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã›ã‚“。
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/testing
+</programlisting>
+</para>
+</refsect2>
+
+ <refsect2>
+<!--
+ <title>Tracking Testing or Unstable</title>
+-->
+ <title>テスト版やä¸å®‰å®šç‰ˆã‚’追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign
+a high priority to package versions from the <literal>testing</literal>
+distribution, a lower priority to package versions from the
+<literal>unstable</literal> distribution, and a prohibitively low priority
+to package versions from other <literal>Debian</literal> distributions.
+-->
+<para>以下㮠APT 設定ファイルã¯ã€<literal>testing</literal>
+ディストリビューションã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«é«˜ã„優先度を割り当ã¦ã€
+<literal>unstable</literal>
+ディストリビューションã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ä½Žã„優先度を割り当ã¦ã¾ã™ã€‚
+ã¾ãŸä»–ã® <literal>Debian</literal>
+ディストリビューションã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ã€
+低ãã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ããªã„よã†ãªå„ªå…ˆåº¦ã‚’割り当ã¦ã¾ã™ã€‚
+
+<programlisting>
+Package: *
+Pin: release a=testing
+Pin-Priority: 900
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 800
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the latest
+<literal>testing</literal> version(s).
+-->
+<para>é©åˆ‡ãª &sources-list; ファイルã¨ä¸Šè¨˜ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚Šã€
+以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§æœ€æ–°ã® <literal>testing</literal>
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã§ãã¾ã™ã€‚
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>unstable</literal> distribution.
+Thereafter, <command>apt-get upgrade</command> will upgrade
+the package to the most recent <literal>testing</literal> version if that is
+more recent than the installed version, otherwise, to the most recent
+<literal>unstable</literal> version if that is more recent than the installed
+version.
+-->
+<para>以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã€æŒ‡å®šã—ãŸãƒ‘ッケージを <literal>unstable</literal>
+ディストリビューションã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚
+ãれ以é™ã€<command>apt-get upgrade</command> ã¯
+<literal>testing</literal> ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージãŒæ›´æ–°ã•ã‚Œã¦ã„ã‚Œã°
+<literal>testing</literal> ã®æœ€æ–°ç‰ˆã«ã€
+<literal>unstable</literal> ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージãŒæ›´æ–°ã•ã‚Œã¦ã„ã‚Œã°
+<literal>unstable</literal>ã®æœ€æ–°ç‰ˆã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/unstable
+</programlisting>
+</para>
+
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>See Also</title>
+-->
+<title>関連項目</title>
+<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
+</para>
+</refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/makefile b/doc/ja/makefile
index 9e757b590..286152995 100644
--- a/doc/ja/makefile
+++ b/doc/ja/makefile
@@ -5,7 +5,59 @@ SUBDIR=doc/ja
# Bring in the default rules
include ../../buildlib/defaults.mak
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+XSLTPROC=/usr/bin/xsltproc
+STYLESHEET=./style.ja.xsl
+
+
# Man pages
-SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5
+SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \
+ sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \
+ apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \
+ apt-key.ja.8 apt-secure.ja.8
+
INCLUDES = apt.ent.ja
-include $(SGML_MANPAGE_H)
+
+doc: $(SOURCE)
+
+$(SOURCE) :: % : %.xml $(INCLUDES)
+ echo Creating man page $@
+ $(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt-cache.ja.8:: apt-cache.8
+ cp $< $@
+
+apt-get.ja.8:: apt-get.8
+ cp $< $@
+
+apt-cdrom.ja.8:: apt-cdrom.8
+ cp $< $@
+
+apt.conf.ja.5:: apt.conf.5
+ cp $< $@
+
+apt-config.ja.8:: apt-config.8
+ cp $< $@
+
+sources.list.ja.5:: sources.list.5
+ cp $< $@
+
+apt-sortpkgs.ja.1:: apt-sortpkgs.1
+ cp $< $@
+
+apt-ftparchive.ja.1:: apt-ftparchive.1
+ cp $< $@
+
+apt_preferences.ja.5:: apt_preferences.5
+ cp $< $@
+
+apt-extracttemplates.ja.1:: apt-extracttemplates.1
+ cp $< $@
+
+apt-key.ja.8:: apt-key.8
+ cp $< $@
+
+apt-secure.ja.8:: apt-secure.8
+ cp $< $@
+
+
diff --git a/doc/ja/manpage.links b/doc/ja/manpage.links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/doc/ja/manpage.links
diff --git a/doc/ja/manpage.refs b/doc/ja/manpage.refs
new file mode 100644
index 000000000..16ffc791b
--- /dev/null
+++ b/doc/ja/manpage.refs
@@ -0,0 +1,4 @@
+{
+ '' => '',
+ '' => ''
+}
diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml
new file mode 100644
index 000000000..e000d8767
--- /dev/null
+++ b/doc/ja/sources.list.ja.5.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>sources.list</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>sources.list</refname>
+<!--
+ <refpurpose>Package resource list for APT</refpurpose>
+-->
+ <refpurpose>APT 用パッケージリソースリスト</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+ -->
+ <refsect1><title>説明</title>
+<!--
+ <para>The package resource list is used to locate archives of the package
+ distribution system in use on the system. At this time, this manual page
+ documents only the packaging system used by the Debian GNU/Linux system.
+ This control file is located in <filename>/etc/apt/sources.list</filename></para>
+-->
+ <para>ã“ã®ãƒ‘ッケージリソースリストã¯ã€
+ システムã§ä½¿ç”¨ã™ã‚‹ãƒ‘ッケージã®ä¿ç®¡å ´æ‰€ã‚’特定ã™ã‚‹ã®ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚
+ 今回ã“ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã«ã¯ã€
+ Debian GNU/Linux システムã§ä½¿ç”¨ã™ã‚‹ãƒ‘ッケージシステムã«ã¤ã„ã¦ã®ã¿è¨˜è¿°ã—ã¾ã™ã€‚
+ ã“ã®åˆ¶å¾¡ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€<filename>/etc/apt/sources.list</filename> ã«ã‚ã‚Šã¾ã™ã€‚</para>
+
+<!--
+ <para>The source list is designed to support any number of active sources and a
+ variety of source media. The file lists one source per line, with the
+ most preferred source listed first. The format of each line is:
+ <literal>type uri args</literal> The first item, <literal>type</literal>
+ determines the format for <literal>args</literal> <literal>uri</literal> is
+ a Universal Resource Identifier
+ (URI), which is a superset of the more specific and well-known Universal
+ Resource Locator, or URL. The rest of the line can be marked as a comment
+ by using a #.</para>
+-->
+ <para>ソースリストã¯è¤‡æ•°ã®æœ‰åŠ¹ãªå–å¾—å…ƒã¨ã€
+ 様々ãªå–得メディアをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚
+ ファイルã«ã¯ 1 è¡Œã”ã¨å–得元を列挙ã—ã€ä¸Šã®æ–¹ã«ã‚ã‚‹ã‚‚ã®ã‹ã‚‰ä½¿ç”¨ã—ã¾ã™ã€‚
+ è¡Œã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã¯ã€<literal>タイプ uri 引数</literal> ã¨ãªã‚Šã¾ã™ã€‚
+ 先頭㮠<literal>タイプ</literal> ã§ã€
+ <literal>引数</literal> ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’決定ã—ã¾ã™ã€‚
+ <literal>uri</literal> 㯠Universal Resource Identifier (URI) ã§ã€
+ よã知られ㟠URL ã®ã‚¹ãƒ¼ãƒ‘ーセットã§ã™ã€‚
+ è¡Œã®æ®‹ã‚Šã« # を付ã‘ã¦ã€ã‚³ãƒ¡ãƒ³ãƒˆã«ã§ãã¾ã™ã€‚</para>
+ </refsect1>
+
+ <refsect1><title>sources.list.d</title>
+<!--
+ <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
+ a way to add sources.list entries in seperate files that end with
+ <literal>.list</literal>. The format is the same as for the regular
+ <filename>sources.list</filename> file. </para>
+-->
+ <para><filename>/etc/apt/sources.list.d</filename> ディレクトリã«
+ ファイルå㌠<literal>.list</literal> ã§çµ‚ã‚る個別ファイルを置ã„ã¦ãŠãã¨ã€
+ sources.list エントリã«è¿½åŠ ã§ãã¾ã™ã€‚フォーマットã¯ã€
+ 通常㮠<filename>sources.list</filename> ファイルã¨åŒã˜ã§ã™ã€‚</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The deb and deb-src types</title>
+-->
+ <refsect1><title>deb タイプ㨠deb-src タイプ</title>
+<!--
+ <para>The <literal>deb</literal> type describes a typical two-level Debian
+ archive, <filename>distribution/component</filename>. Typically,
+ <literal>distribution</literal> is generally one of
+ <literal>stable</literal> <literal>unstable</literal> or
+ <literal>testing</literal> while component is one of <literal>main</literal>
+ <literal>contrib</literal> <literal>non-free</literal> or
+ <literal>non-us</literal> The
+ <literal>deb-src</literal> type describes a debian distribution's source
+ code in the same form as the <literal>deb</literal> type.
+ A <literal>deb-src</literal> line is required to fetch source indexes.</para>
+-->
+ <para><literal>deb</literal> タイプã§ã¯å…¸åž‹çš„㪠2 段階㮠Debian アーカイブ
+ (<filename>distribution/component</filename>) を記述ã—ã¾ã™ã€‚
+ よãã‚るケースã§ã¯ã€<literal>distribution</literal> ã¯é€šå¸¸
+ <literal>stable</literal> <literal>unstable</literal>
+ <literal>testing</literal> ã®ã©ã‚Œã‹ã€
+ component ã¯ã€<literal>main</literal> <literal>contrib</literal>
+ <literal>non-free</literal> <literal>non-us</literal> ã®ã©ã‚Œã‹ã§ã™ã€‚
+ <literal>deb-src</literal> タイプã§ã¯ã€
+ Debian ディストリビューションã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’ã€
+ <literal>deb</literal> タイプã¨åŒã˜å½¢å¼ã§è¨˜è¿°ã—ã¾ã™ã€‚
+ <literal>deb-src</literal> è¡Œã¯ã€
+ ソースインデックスをå–å¾—ã™ã‚‹ã®ã«å¿…è¦ã§ã™ã€‚</para>
+
+<!--
+ <para>The format for a <filename>sources.list</filename> entry using the
+ <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+-->
+ <para><literal>deb</literal> タイプ㨠<literal>deb-src</literal>
+ タイプã§ä½¿ç”¨ã™ã‚‹ <filename>sources.list</filename>
+ エントリã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã¯ã€ä»¥ä¸‹ã«ãªã‚Šã¾ã™ã€‚</para>
+
+ <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
+
+<!--
+ <para>The URI for the <literal>deb</literal> type must specify the base of the
+ Debian distribution, from which APT will find the information it needs.
+ <literal>distribution</literal> can specify an exact path, in which case the
+ components must be omitted and <literal>distribution</literal> must end with
+ a slash (/). This is useful for when only a particular sub-section of the
+ archive denoted by the URI is of interest.
+ If <literal>distribution</literal> does not specify an exact path, at least
+ one <literal>component</literal> must be present.</para>
+-->
+ <para><literal>deb</literal> タイプ㮠URI ã¯ã€
+ APT ãŒæƒ…報を見ã¤ã‘られるよã†ã«ã€
+ Debian ディストリビューションã®åŸºåº•ã‚’指定ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
+ <literal>distribution</literal> ã«ã¯æ­£ç¢ºãªãƒ‘スを指定ã§ãã¾ã™ã€‚
+ ãã®å ´åˆ component ã‚’çœç•¥ã—ã€<literal>distribution</literal>
+ ã¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ (/) ã§çµ‚ã‚らãªãã¦ã¯ãªã‚Šã¾ã›ã‚“。
+ ã“れ㯠URL ã§æŒ‡å®šã•ã‚ŒãŸã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ã€
+ 特定ã®ã‚µãƒ–セクションã®ã¿ã«é–¢å¿ƒãŒã‚ã‚‹ã¨ãã«å½¹ã«ç«‹ã¡ã¾ã™ã€‚
+ <literal>distribution</literal> ã«æ­£ç¢ºãªãƒ‘スを指定ã—ãªã„ã®ãªã‚‰ã€
+ å°‘ãªãã¨ã‚‚ã²ã¨ã¤ã¯ <literal>component</literal> を指定ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。</para>
+
+<!--
+ <para><literal>distribution</literal> may also contain a variable,
+ <literal>$(ARCH)</literal>
+ which expands to the Debian architecture (i386, m68k, powerpc, ...)
+ used on the system. This permits architecture-independent
+ <filename>sources.list</filename> files to be used. In general this is only
+ of interest when specifying an exact path, <literal>APT</literal> will
+ automatically generate a URI with the current architecture otherwise.</para>
+-->
+ <para><literal>distribution</literal> ã¯ã€
+ <literal>$(ARCH)</literal> 変数をå«ã‚€å ´åˆãŒã‚ã‚Šã¾ã™ã€‚
+ <literal>$(ARCH)</literal> 変数ã¯ã€ã‚·ã‚¹ãƒ†ãƒ ã§ä½¿ç”¨ã—ã¦ã„ã‚‹
+ Debian アーキテクãƒãƒ£ (i386, m68k, powerpc, ...) ã«å±•é–‹ã•ã‚Œã¾ã™ã€‚
+ ã“ã‚Œã«ã‚ˆã‚Šã€ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã«ä¾å­˜ã—ãªã„ <filename>sources.list</filename>
+ ファイルを使用ã§ãã¾ã™ã€‚
+ 一般的ã«ã€ã“ã‚Œã¯æ­£ã—ã„パスを指定ã™ã‚‹ã¨ãã«æ°—ã«ã™ã‚‹ã ã‘ã§ã™ã€‚
+ ãã†ã§ãªã„å ´åˆã¯ã€<literal>APT</literal> ã¯ç¾åœ¨ã®ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã§ URI
+ を自動的ã«ç”Ÿæˆã—ã¾ã™ã€‚</para>
+
+<!--
+ <para>Since only one distribution can be specified per line it may be necessary
+ to have multiple lines for the same URI, if a subset of all available
+ distributions or components at that location is desired.
+ APT will sort the URI list after it has generated a complete set
+ internally, and will collapse multiple references to the same Internet
+ host, for instance, into a single connection, so that it does not
+ inefficiently establish an FTP connection, close it, do something else,
+ and then re-establish a connection to that same host. This feature is
+ useful for accessing busy FTP sites with limits on the number of
+ simultaneous anonymous users. APT also parallelizes connections to
+ different hosts to more effectively deal with sites with low bandwidth.</para>
+-->
+ <para>有効ãªå…¨ distribution, component ã®å ´æ‰€ã‹ã‚‰ã€
+ 一部ãŒå¿…è¦ãªå ´åˆã€1 è¡Œã«ã¤ã 1 distribution ã—ã‹æŒ‡å®šã§ããªã„ãŸã‚ã€
+ åŒã˜ URI ã®è¡Œã‚’複数記述ã™ã‚‹ã“ã¨ã«ãªã‚‹ã§ã—ょã†ã€‚
+ APT ã¯å†…部㧠URI リストを生æˆã—ã¦ã‹ã‚‰ã€ä¸¦ã¹æ›¿ãˆã¾ã™ã€‚
+ ãã—ã¦ã€åŒã˜ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆãƒ›ã‚¹ãƒˆã«å¯¾ã—ã¦ã¯è¤‡æ•°ã®å‚照をã¾ã¨ã‚ã¾ã™ã€‚
+ 例ãˆã° FTP 接続後ã€åˆ‡æ–­ã—ã¦ã‹ã‚‰ã¾ãŸåŒã˜ãƒ›ã‚¹ãƒˆã«å†æŽ¥ç¶šã™ã‚‹ã¨ã„ã£ãŸã€
+ 効率ã®æ‚ªã„ã“ã¨ã‚’ã›ãšã«ã€1 接続ã«ã¾ã¨ã‚ã¾ã™ã€‚
+ ã“ã®æ©Ÿèƒ½ã¯ã€åŒæ™‚接続匿åユーザ数を制é™ã—ã¦ã„ã‚‹ã€
+ æ··ã‚“ã§ã„ã‚‹ FTP サイトã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«ä¾¿åˆ©ã§ã™ã€‚
+ APT ã¯ã€å¸¯åŸŸã®ç‹­ã„サイトを効率よã扱ã†ã®ã«ã€
+ ç•°ãªã‚‹ãƒ›ã‚¹ãƒˆã¸ã¯ã€æŽ¥ç¶šã‚’並行ã—ã¦è¡Œã†ã‚ˆã†ã«ã‚‚ã—ã¦ã„ã¾ã™ã€‚</para>
+
+<!--
+ <para>It is important to list sources in order of preference, with the most
+ preferred source listed first. Typically this will result in sorting
+ by speed from fastest to slowest (CD-ROM followed by hosts on a local
+ network, followed by distant Internet hosts, for example).</para>
+-->
+ <para>最優先ã™ã‚‹å–得元を最åˆã«è¨˜è¿°ã™ã‚‹ã¨ã„ã†ã‚ˆã†ã«ã€
+ 優先順ã«å–得元を記述ã™ã‚‹ã®ã¯é‡è¦ã§ã™ã€‚
+ 一般的ã«ã¯ã€ã‚¹ãƒ”ードã®é€Ÿã„é †ã«ä¸¦ã¹ã‚‹ã“ã¨ã«ãªã‚‹
+ (例ãˆã°ã€CD-ROM ã«ç¶šã„ã¦ãƒ­ãƒ¼ã‚«ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ãƒ›ã‚¹ãƒˆã€
+ ã•ã‚‰ã«ç¶šã„ã¦å½¼æ–¹ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆãƒ›ã‚¹ãƒˆ) ã§ã—ょã†ã€‚</para>
+
+<!--
+ <para>Some examples:</para>
+-->
+ <para>例:</para>
+ <literallayout>
+deb http://http.us.debian.org/debian stable main contrib non-free
+deb http://http.us.debian.org/debian dists/stable-updates/
+ </literallayout>
+
+ </refsect1>
+
+<!--
+ <refsect1><title>URI specification</title>
+-->
+ <refsect1><title>URI ã®ä»•æ§˜</title>
+
+<!--
+ <para>The currently recognized URI types are cdrom, file, http, and ftp.
+-->
+ <para>ç¾åœ¨èªè­˜ã™ã‚‹ URI 対応ã¯ã€cdrom, file, http, ftp ã§ã™ã€‚
+ <variablelist>
+ <varlistentry><term>file</term>
+<!--
+ <listitem><para>
+ The file scheme allows an arbitrary directory in the file system to be
+ considered an archive. This is useful for NFS mounts and local mirrors or
+ archives.</para></listitem>
+-->
+ <listitem><para>
+ file スキームã¯ã€ã‚·ã‚¹ãƒ†ãƒ å†…ã®ä»»æ„ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€
+ アーカイブã¨ã—ã¦æ‰±ãˆã‚‹ã‚ˆã†ã«ã—ã¾ã™ã€‚
+ ã“れ㯠NFS マウントやローカルミラーã§ä¾¿åˆ©ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>cdrom</term>
+<!--
+ <listitem><para>
+ The cdrom scheme allows APT to use a local CDROM drive with media
+ swapping. Use the &apt-cdrom; program to create cdrom entries in the
+ source list.</para></listitem>
+-->
+ <listitem><para>
+ cdrom スキームã¯ã€APT ãŒãƒ­ãƒ¼ã‚«ãƒ« CD-ROM ドライブをã€
+ メディア交æ›ã—ãªãŒã‚‰ä½¿ãˆã‚‹ã‚ˆã†ã«ã—ã¾ã™ã€‚
+ å–得元リスト㫠cdrom エントリを追加ã™ã‚‹ã«ã¯ã€
+ &apt-cdrom; プログラムを使用ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>http</term>
+<!--
+ <listitem><para>
+ The http scheme specifies an HTTP server for the archive. If an environment
+ variable <envar>http_proxy</envar> is set with the format
+ http://server:port/, the proxy server specified in
+ <envar>http_proxy</envar> will be used. Users of authenticated
+ HTTP/1.1 proxies may use a string of the format
+ http://user:pass@server:port/
+ Note that this is an insecure method of authentication.</para></listitem>
+-->
+ <listitem><para>
+ http スキームã¯ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã¨ã—ã¦ã€HTTP サーãƒã‚’指定ã—ã¾ã™ã€‚
+ 環境変数 <envar>http_proxy</envar> ãŒã€
+ http://server:port/ ã¨è¨€ã£ãŸå½¢ã§æŒ‡å®šã•ã‚Œã¦ã„ã‚Œã°ã€
+ <envar>http_proxy</envar> ã§æŒ‡å®šã—㟠プロキシサーãƒã‚’使用ã—ã¾ã™ã€‚
+ ユーザèªè¨¼ãŒå¿…è¦ãª HTTP/1.1 プロキシã®å ´åˆã€
+ http://user:pass@server:port/ ã¨è¨€ã†å½¢ã§æŒ‡å®šã—ã¦ãã ã•ã„。
+ ã“ã®èªè¨¼æ–¹æ³•ã¯å®‰å…¨ã§ã¯ãªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ftp</term>
+<!--
+ <listitem><para>
+ The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
+ is highly configurable; for more information see the
+ &apt-conf; manual page. Please note that a ftp proxy can be specified
+ by using the <envar>ftp_proxy</envar> environment variable. It is possible
+ to specify a http proxy (http proxy servers often understand ftp urls)
+ using this method and ONLY this method. ftp proxies using http specified in
+ the configuration file will be ignored.</para></listitem>
+-->
+ <listitem><para>
+ ftp スキームã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« FTP サーãƒã‚’指定ã—ã¾ã™ã€‚
+ APT ã® FTP ã®æŒ¯ã‚‹èˆžã„ã¯ã€é«˜åº¦ã«è¨­å®šã§ãã¾ã™ã€‚
+ 詳細ã¯ã€&apt-conf; ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’ã”覧ãã ã•ã„。
+ ftp プロキシã¯ã€
+ <envar>ftp_proxy</envar> 環境変数ã§æŒ‡å®šã™ã‚‹ã“ã¨ã«ã”注æ„ãã ã•ã„。
+ ã“ã®æ–¹æ³•ç”¨ã«ã€ã•ã‚‰ã«ã“ã®æ–¹æ³•ã§ã—ã‹ä½¿ç”¨ã—ãªã„ã®ã«ã€
+ http プロキシを使用ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™
+ (http プロキシサーãƒã¯å¤§æŠµ ftp urlã‚‚ç†è§£ã§ãã¾ã™)。
+ 設定ファイル㧠http を使用ã™ã‚‹éš›ã«ã€
+ ftp プロキシを使用ã™ã‚‹ã‚ˆã†è¨­å®šã—ã¦ã‚ã£ã¦ã‚‚無視ã•ã‚Œã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>copy</term>
+<!--
+ <listitem><para>
+ The copy scheme is identical to the file scheme except that packages are
+ copied into the cache directory instead of used directly at their location.
+ This is useful for people using a zip disk to copy files around with APT.</para></listitem>
+-->
+ <listitem><para>
+ copy スキームã¯ã€file スキームã¨åŒæ§˜ã§ã™ãŒã€ãƒ‘ッケージをãã®å ´ã§ä½¿ç”¨ã›ãšã€
+ キャッシュディレクトリã«ã‚³ãƒ”ーã™ã‚‹ã¨ã“ã‚ãŒé•ã„ã¾ã™ã€‚
+ zip ディスクを使用ã—ã¦ã„ã¦ã€APT ã§ã‚³ãƒ”ーを行ã†å ´åˆã«ä¾¿åˆ©ã§ã™ã€‚</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>rsh</term><term>ssh</term>
+<!--
+ <listitem><para>
+ The rsh/ssh method invokes rsh/ssh to connect to a remote host
+ as a given user and access the files. No password authentication is
+ possible, prior arrangements with RSA keys or rhosts must have been made.
+ Access to files on the remote uses standard <command>find</command> and
+ <command>dd</command>
+ commands to perform the file transfers from the remote.</para></listitem>
+-->
+ <listitem><para>
+ rsh/ssh メソッドã¯ã€ä¸Žãˆã‚‰ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ã§ãƒªãƒ¢ãƒ¼ãƒˆãƒ›ã‚¹ãƒˆã«æŽ¥ç¶šã—ã€
+ ファイルã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã« rsh/ssh を使用ã—ã¾ã™ã€‚
+ ã‚らã‹ã˜ã‚ RSA キーや rhosts ã®é…ç½®ãŒå¿…è¦ã§ã™ãŒã€
+ パスワードãªã—èªè¨¼ãŒå¯èƒ½ã§ã™ã€‚
+ リモートホストã®ãƒ•ã‚¡ã‚¤ãƒ«ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã®éš›ã€
+ ファイル転é€ã«æ¨™æº–ã® <command>find</command> コマンドや
+ <command>dd</command> コマンドを使用ã—ã¾ã™ã€‚</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>サンプル</title>
+<!--
+ <para>Uses the archive stored locally (or NFS mounted) at /home/jason/debian
+ for stable/main, stable/contrib, and stable/non-free.</para>
+-->
+ <para> /home/jason/debian ã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹ stable/main, stable/contrib,
+ stable/non-free 用ã®ãƒ­ãƒ¼ã‚«ãƒ« (ã¾ãŸã¯ NFS) アーカイブを使用ã—ã¾ã™ã€‚</para>
+ <literallayout>deb file:/home/jason/debian stable main contrib non-free</literallayout>
+
+<!--
+ <para>As above, except this uses the unstable (development) distribution.</para>
+-->
+ <para>上記åŒæ§˜ã§ã™ãŒã€ä¸å®‰å®šç‰ˆã‚’使用ã—ã¾ã™ã€‚</para>
+ <literallayout>deb file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+ <para>Source line for the above</para>
+-->
+ <para>上記ã®ã‚½ãƒ¼ã‚¹è¡Œ</para>
+ <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at archive.debian.org, and uses only
+ the hamm/main area.</para>
+-->
+ <para>archive.debian.org ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« HTTP アクセスã—ã€
+ hamm/main ã®ã¿ã‚’使用ã—ã¾ã™ã€‚</para>
+ <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
+
+<!--
+ <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+ directory, and uses only the stable/contrib area.</para>
+-->
+ <para>ftp.debian.org ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« FTP アクセスã—ã€
+ debian ディレクトリ以下㮠stable/contrib ã®ã¿ã‚’使用ã—ã¾ã™ã€‚</para>
+ <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
+
+<!--
+ <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+ directory, and uses only the unstable/contrib area. If this line appears as
+ well as the one in the previous example in <filename>sources.list</filename>.
+ a single FTP session will be used for both resource lines.</para>
+-->
+ <para>ftp.debian.org ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« FTP アクセスã—ã€
+ debian ディレクトリ以下㮠unstable/contrib を使用ã—ã¾ã™ã€‚
+ <filename>sources.list</filename> ã«ä¸Šè¨˜ã‚µãƒ³ãƒ—ルã¨ä¸€ç·’ã«æŒ‡å®šã•ã‚ŒãŸå ´åˆã€
+ 両方ã®ãƒªã‚½ãƒ¼ã‚¹è¡Œã«å¯¾å¿œã™ã‚‹ FTP セッションã¯ã²ã¨ã¤ã ã‘ã«ãªã‚Šã¾ã™ã€‚</para>
+ <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at nonus.debian.org, under the
+ debian-non-US directory.</para>
+-->
+ <para>nonus.debian.org ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« HTTP アクセスã—ã€
+ debian-non-US ディレクトリ以下を使用ã—ã¾ã™ã€‚</para>
+ <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at nonus.debian.org, under the
+ debian-non-US directory, and uses only files found under
+ <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-m68k</filename> on m68k, and so
+ forth for other supported architectures. [Note this example only
+ illustrates how to use the substitution variable; non-us is no longer
+ structured like this]
+ <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+ </para>
+-->
+ <para>nonus.debian.org ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã« HTTP アクセスã—ã€
+ debian-non-US ディレクトリ以下を使用ã—ã¾ã™ã€‚
+ ã¾ãŸã€i386 マシンã§ã¯ <filename>unstable/binary-i386</filename>
+ 以下ã«ã‚るファイルã€
+ m68k マシンã§ã¯ <filename>unstable/binary-m68k</filename>
+ 以下ã«ã‚るファイルã€
+ ãã®ä»–サãƒãƒ¼ãƒˆã™ã‚‹ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã”ã¨ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ä½¿ç”¨ã—ã¾ã™ã€‚
+ [ã“ã®ã‚µãƒ³ãƒ—ルã¯å¤‰æ•°å±•é–‹ã®ä½¿ç”¨æ³•ã®èª¬æ˜Žã§ã—ã‹ãªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
+ non-us ã¯ã“ã®ã‚ˆã†ãªæ§‹é€ ã«ãªã£ã¦ã„ã¾ã›ã‚“]
+ <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-cache; &apt-conf;
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl
new file mode 100644
index 000000000..4af2d74cf
--- /dev/null
+++ b/doc/ja/style.ja.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+
+<xsl:param name="chunker.output.encoding" select="'EUC-JP'" />
+
+</xsl:stylesheet> \ No newline at end of file
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index bde9893bf..e47418b27 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -46,6 +46,13 @@
by using a #.</para>
</refsect1>
+ <refsect1><title>sources.list.d</title>
+ <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
+ a way to add sources.list entries in seperate files that end with
+ <literal>.list</literal>. The format is the same as for the regular
+ <filename>sources.list</filename> file. </para>
+ </refsect1>
+
<refsect1><title>The deb and deb-src types</title>
<para>The <literal>deb</literal> type describes a typical two-level Debian
archive, <filename>distribution/component</filename>. Typically,
@@ -197,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<para>Uses HTTP to access the archive at nonus.debian.org, under the
debian-non-US directory, and uses only files found under
- <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-i386</filename> on i386 machines,
<filename>unstable/binary-m68k</filename> on m68k, and so
forth for other supported architectures. [Note this example only
illustrates how to use the substitution variable; non-us is no longer
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 9e93dff05..8a4ca0236 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -19,6 +19,8 @@
#include <apti18n.h>
#include <apt-pkg/error.h>
#include <apt-pkg/md5.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha256.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
@@ -54,7 +56,7 @@ bool CacheDB::ReadyDB(string DB)
return true;
db_create(&Dbp, NULL, 0);
- if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_HASH,
+ if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_BTREE,
(ReadOnly?DB_RDONLY:DB_CREATE),
0644)) != 0)
{
@@ -67,6 +69,12 @@ bool CacheDB::ReadyDB(string DB)
(ReadOnly?DB_RDONLY:DB_CREATE), 0644);
}
+ // the database format has changed from DB_HASH to DB_BTREE in
+ // apt 0.6.44
+ if (err == EINVAL)
+ {
+ _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database."));
+ }
if (err)
{
Dbp = 0;
@@ -79,48 +87,123 @@ bool CacheDB::ReadyDB(string DB)
return true;
}
/*}}}*/
-// CacheDB::SetFile - Select a file to be working with /*{{{*/
+// CacheDB::OpenFile - Open the filei /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CacheDB::OpenFile()
+{
+ 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 /*{{{*/
+// ---------------------------------------------------------------------
+/* This gets the size from the database if it's there. If we need
+ * to look at the file, also get the mtime from the file. */
+bool CacheDB::GetFileStat()
+{
+ if ((CurStat.Flags & FlSize) == FlSize)
+ {
+ /* 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. /*{{{*/
// ---------------------------------------------------------------------
-/* All future actions will be performed against this file */
-bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd)
+/* Sets the CurStat variable. Either to 0 if no database is used
+ * or to the value in the database if one is used */
+bool CacheDB::GetCurStat()
{
- delete DebFile;
- DebFile = 0;
- this->FileName = FileName;
- this->Fd = Fd;
- this->FileStat = St;
- FileStat = St;
memset(&CurStat,0,sizeof(CurStat));
- Stats.Bytes += St.st_size;
- Stats.Packages++;
-
- if (DBLoaded == false)
- return true;
+ if (DBLoaded)
+ {
+ /* First see if thre 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;
- // Lookup the stat info and confirm the file is unchanged
- if (Get() == true)
- {
- if (CurStat.mtime != htonl(St.st_mtime))
+ if (Get() == false)
{
- CurStat.mtime = htonl(St.st_mtime);
CurStat.Flags = 0;
- _error->Warning(_("File date has changed %s"),FileName.c_str());
}
+ CurStat.Flags = ntohl(CurStat.Flags);
+ CurStat.FileSize = ntohl(CurStat.FileSize);
}
- else
+ return true;
+}
+ /*}}}*/
+// CacheDB::GetFileInfo - Get all the info about the file /*{{{*/
+// ---------------------------------------------------------------------
+bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents,
+ bool GenContentsOnly,
+ bool DoMD5, bool DoSHA1, bool DoSHA256)
+{
+ this->FileName = FileName;
+
+ if (GetCurStat() == false)
{
- CurStat.mtime = htonl(St.st_mtime);
- CurStat.Flags = 0;
+ return false;
}
- CurStat.Flags = ntohl(CurStat.Flags);
OldStat = CurStat;
+
+ if (GetFileStat() == false)
+ {
+ delete Fd;
+ Fd = NULL;
+ return false;
+ }
+
+ 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)
+ {
+ delete Fd;
+ Fd = NULL;
+ delete DebFile;
+ DebFile = NULL;
+ return false;
+ }
+
+ delete Fd;
+ Fd = NULL;
+ delete DebFile;
+ DebFile = NULL;
+
return true;
}
/*}}}*/
@@ -139,6 +222,10 @@ bool CacheDB::LoadControl()
CurStat.Flags &= ~FlControl;
}
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
// Create a deb instance to read the archive
if (DebFile == 0)
{
@@ -183,6 +270,10 @@ bool CacheDB::LoadContents(bool GenOnly)
CurStat.Flags &= ~FlContents;
}
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
// Create a deb instance to read the archive
if (DebFile == 0)
{
@@ -201,10 +292,37 @@ bool CacheDB::LoadContents(bool GenOnly)
return true;
}
/*}}}*/
+
+static string bytes2hex(uint8_t *bytes, size_t length) {
+ char space[65];
+ if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2;
+ for (size_t i = 0; i < length; i++)
+ snprintf(&space[i*2], 3, "%02x", bytes[i]);
+ return string(space);
+}
+
+static inline unsigned char xdig2num(char dig) {
+ if (isdigit(dig)) return dig - '0';
+ if ('a' <= dig && dig <= 'f') return dig - 'a' + 10;
+ if ('A' <= dig && dig <= 'F') return dig - 'A' + 10;
+ return 0;
+}
+
+static void hex2bytes(uint8_t *bytes, const char *hex, int length) {
+ while (length-- > 0) {
+ *bytes = 0;
+ if (isxdigit(hex[0]) && isxdigit(hex[1])) {
+ *bytes = xdig2num(hex[0]) * 16 + xdig2num(hex[1]);
+ hex += 2;
+ }
+ bytes++;
+ }
+}
+
// CacheDB::GetMD5 - Get the MD5 hash /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool CacheDB::GetMD5(string &MD5Res,bool GenOnly)
+bool CacheDB::GetMD5(bool GenOnly)
{
// Try to read the control information out of the DB.
if ((CurStat.Flags & FlMD5) == FlMD5)
@@ -212,28 +330,88 @@ bool CacheDB::GetMD5(string &MD5Res,bool GenOnly)
if (GenOnly == true)
return true;
- InitQuery("m5");
- if (Get() == true)
- {
- MD5Res = string((char *)Data.data,Data.size);
+ MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5));
return true;
}
- CurStat.Flags &= ~FlMD5;
- }
- Stats.MD5Bytes += FileStat.st_size;
+ Stats.MD5Bytes += CurStat.FileSize;
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
MD5Summation MD5;
- if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),FileStat.st_size) == false)
+ if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false)
return false;
MD5Res = MD5.Result();
- InitQuery("m5");
- if (Put(MD5Res.c_str(),MD5Res.length()) == true)
+ hex2bytes(CurStat.MD5, MD5Res.data(), sizeof(CurStat.MD5));
CurStat.Flags |= FlMD5;
return true;
}
/*}}}*/
+// CacheDB::GetSHA1 - Get the SHA1 hash /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CacheDB::GetSHA1(bool GenOnly)
+{
+ // Try to read the control information out of the DB.
+ if ((CurStat.Flags & FlSHA1) == FlSHA1)
+ {
+ if (GenOnly == true)
+ return true;
+
+ SHA1Res = bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1));
+ return true;
+ }
+
+ Stats.SHA1Bytes += CurStat.FileSize;
+
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
+ SHA1Summation SHA1;
+ if (Fd->Seek(0) == false || SHA1.AddFD(Fd->Fd(),CurStat.FileSize) == false)
+ return false;
+
+ SHA1Res = SHA1.Result();
+ hex2bytes(CurStat.SHA1, SHA1Res.data(), sizeof(CurStat.SHA1));
+ CurStat.Flags |= FlSHA1;
+ return true;
+}
+ /*}}}*/
+// CacheDB::GetSHA256 - Get the SHA256 hash /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CacheDB::GetSHA256(bool GenOnly)
+{
+ // Try to read the control information out of the DB.
+ if ((CurStat.Flags & FlSHA256) == FlSHA256)
+ {
+ if (GenOnly == true)
+ return true;
+
+ SHA256Res = bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256));
+ return true;
+ }
+
+ Stats.SHA256Bytes += CurStat.FileSize;
+
+ if (Fd == NULL && OpenFile() == false)
+ {
+ return false;
+ }
+ SHA256Summation SHA256;
+ if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false)
+ return false;
+
+ SHA256Res = SHA256.Result();
+ hex2bytes(CurStat.SHA256, SHA256Res.data(), sizeof(CurStat.SHA256));
+ CurStat.Flags |= FlSHA256;
+ return true;
+}
+ /*}}}*/
// CacheDB::Finish - Write back the cache structure /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -246,9 +424,12 @@ bool CacheDB::Finish()
// Write the stat information
CurStat.Flags = htonl(CurStat.Flags);
+ CurStat.FileSize = htonl(CurStat.FileSize);
InitQuery("st");
Put(&CurStat,sizeof(CurStat));
CurStat.Flags = ntohl(CurStat.Flags);
+ CurStat.FileSize = ntohl(CurStat.FileSize);
+
return true;
}
/*}}}*/
@@ -272,16 +453,14 @@ bool CacheDB::Clean()
memset(&Data,0,sizeof(Data));
while ((errno = Cursor->c_get(Cursor,&Key,&Data,DB_NEXT)) == 0)
{
- const char *Colon = (char *)Key.data;
- for (; Colon != (char *)Key.data+Key.size && *Colon != ':'; Colon++);
- if ((char *)Key.data+Key.size - Colon > 2)
+ const char *Colon = (char*)memrchr(Key.data, ':', Key.size);
+ if (Colon)
{
- if (stringcmp((char *)Key.data,Colon,"st") == 0 ||
- stringcmp((char *)Key.data,Colon,"cn") == 0 ||
- stringcmp((char *)Key.data,Colon,"m5") == 0 ||
- stringcmp((char *)Key.data,Colon,"cl") == 0)
+ 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,"cn") == 0)
{
- if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true)
+ if (FileExists(string((const char *)Key.data,Colon)) == true)
continue;
}
}
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 1b043e1aa..afa22213a 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -44,7 +44,7 @@ class CacheDB
memset(&Key,0,sizeof(Key));
memset(&Data,0,sizeof(Data));
Key.data = TmpKey;
- Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",Type,FileName.c_str());
+ Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
}
inline bool Get()
@@ -64,19 +64,31 @@ class CacheDB
}
return true;
}
+ bool OpenFile();
+ bool GetFileStat();
+ bool GetCurStat();
+ bool LoadControl();
+ bool LoadContents(bool GenOnly);
+ bool GetMD5(bool GenOnly);
+ bool GetSHA1(bool GenOnly);
+ bool GetSHA256(bool GenOnly);
// 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)};
+ enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
+ FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)};
struct StatStore
{
- time_t mtime;
uint32_t Flags;
+ uint32_t mtime;
+ uint32_t FileSize;
+ uint8_t MD5[16];
+ uint8_t SHA1[20];
+ uint8_t SHA256[32];
} CurStat;
struct StatStore OldStat;
// 'set' state
string FileName;
- struct stat FileStat;
FileFd *Fd;
debDebFile *DebFile;
@@ -85,34 +97,42 @@ class CacheDB
// Data collection helpers
debDebFile::MemControlExtract Control;
ContentsExtract Contents;
+ string MD5Res;
+ string SHA1Res;
+ string SHA256Res;
// Runtime statistics
struct Stats
{
double Bytes;
double MD5Bytes;
+ double SHA1Bytes;
+ double SHA256Bytes;
unsigned long Packages;
unsigned long Misses;
unsigned long DeLinkBytes;
- inline void Add(const Stats &S) {Bytes += S.Bytes; MD5Bytes += S.MD5Bytes;
+ inline void Add(const Stats &S) {
+ Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes;
+ SHA256Bytes += S.SHA256Bytes;
Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;};
- Stats() : Bytes(0), MD5Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+ Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
} Stats;
bool ReadyDB(string DB);
inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
inline bool Loaded() {return DBLoaded == true;};
+ inline off_t GetFileSize(void) {return CurStat.FileSize;}
+
bool SetFile(string FileName,struct stat St,FileFd *Fd);
- bool LoadControl();
- bool LoadContents(bool GenOnly);
- bool GetMD5(string &MD5Res,bool GenOnly);
+ bool GetFileInfo(string FileName, bool DoControl, bool DoContents,
+ bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256);
bool Finish();
bool Clean();
- CacheDB(string DB) : Dbp(0), DebFile(0) {ReadyDB(DB);};
+ CacheDB(string DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
~CacheDB() {ReadyDB(string()); delete DebFile;};
};
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index fc9ea27d7..ea242d6af 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -23,6 +23,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha256.h>
#include <apt-pkg/deblistparser.h>
#include <sys/types.h>
@@ -70,7 +71,7 @@ FTWScanner::FTWScanner()
// ---------------------------------------------------------------------
/* This is the FTW scanner, it processes each directory element in the
directory tree. */
-int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag)
+int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag)
{
if (Flag == FTW_DNR)
{
@@ -85,6 +86,14 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag)
if (Flag != FTW_F)
return 0;
+ return ScannerFile(File, true);
+}
+ /*}}}*/
+// FTWScanner::ScannerFile - File Scanner /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+int FTWScanner::ScannerFile(const char *File, bool ReadLink)
+{
const char *LastComponent = strrchr(File, '/');
if (LastComponent == NULL)
LastComponent = File;
@@ -105,7 +114,8 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag)
given are not links themselves. */
char Jnk[2];
Owner->OriginalPath = File;
- if (Owner->RealPath != 0 && readlink(File,Jnk,sizeof(Jnk)) != -1 &&
+ if (ReadLink && Owner->RealPath != 0 &&
+ readlink(File,Jnk,sizeof(Jnk)) != -1 &&
realpath(File,Owner->RealPath) != 0)
Owner->DoPackage(Owner->RealPath);
else
@@ -154,7 +164,7 @@ bool FTWScanner::RecursiveScan(string Dir)
// Do recursive directory searching
Owner = this;
- int Res = ftw(Dir.c_str(),Scanner,30);
+ int Res = ftw(Dir.c_str(),ScannerFTW,30);
// Error treewalking?
if (Res != 0)
@@ -209,12 +219,14 @@ bool FTWScanner::LoadFileList(string Dir,string File)
FileName = Line;
}
+#if 0
struct stat St;
int Flag = FTW_F;
if (stat(FileName,&St) != 0)
Flag = FTW_NS;
+#endif
- if (Scanner(FileName,&St,Flag) != 0)
+ if (ScannerFile(FileName, false) != 0)
break;
}
@@ -227,7 +239,7 @@ bool FTWScanner::LoadFileList(string Dir,string File)
/* */
bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
unsigned long &DeLinkBytes,
- struct stat &St)
+ off_t FileSize)
{
// See if this isn't an internaly prefix'd file name.
if (InternalPrefix.empty() == false &&
@@ -243,7 +255,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
NewLine(1);
ioprintf(c1out, _(" DeLink %s [%s]\n"), (OriginalPath + InternalPrefix.length()),
- SizeToStr(St.st_size).c_str());
+ SizeToStr(FileSize).c_str());
c1out << flush;
if (NoLinkAct == false)
@@ -269,7 +281,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
}
}
- DeLinkBytes += St.st_size;
+ DeLinkBytes += FileSize;
if (DeLinkBytes/1024 >= DeLinkLimit)
ioprintf(c1out, _(" DeLink limit of %sB hit.\n"), SizeToStr(DeLinkBytes).c_str());
}
@@ -295,6 +307,8 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides,
// Process the command line options
DoMD5 = _config->FindB("APT::FTPArchive::MD5",true);
+ DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true);
+ DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true);
DoContents = _config->FindB("APT::FTPArchive::Contents",true);
NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);
@@ -343,29 +357,19 @@ bool FTWScanner::SetExts(string Vals)
// PackagesWriter::DoPackage - Process a single package /*{{{*/
// ---------------------------------------------------------------------
/* This method takes a package and gets its control information and
- MD5 then writes out a control record with the proper fields rewritten
- and the path/size/hash appended. */
+ MD5, SHA1 and SHA256 then writes out a control record with the proper fields
+ rewritten and the path/size/hash appended. */
bool PackagesWriter::DoPackage(string FileName)
{
- // Open the archive
- FileFd F(FileName,FileFd::ReadOnly);
- if (_error->PendingError() == true)
- return false;
-
- // Stat the file for later
- struct stat St;
- if (fstat(F.Fd(),&St) != 0)
- return _error->Errno("fstat",_("Failed to stat %s"),FileName.c_str());
-
// Pull all the data we need form the DB
- string MD5Res;
- if (Db.SetFile(FileName,St,&F) == false ||
- Db.LoadControl() == false ||
- (DoContents == true && Db.LoadContents(true) == false) ||
- (DoMD5 == true && Db.GetMD5(MD5Res,false) == false))
+ if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256)
+ == false)
+ {
return false;
+ }
- if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,St) == false)
+ off_t FileSize = Db.GetFileSize();
+ if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false)
return false;
// Lookup the overide information
@@ -400,7 +404,7 @@ bool PackagesWriter::DoPackage(string FileName)
}
char Size[40];
- sprintf(Size,"%lu",St.st_size);
+ sprintf(Size,"%lu", (unsigned long) FileSize);
// Strip the DirStrip prefix from the FileName and add the PathPrefix
string NewFileName;
@@ -420,7 +424,9 @@ bool PackagesWriter::DoPackage(string FileName)
unsigned int End = 0;
SetTFRewriteData(Changes[End++], "Size", Size);
- SetTFRewriteData(Changes[End++], "MD5sum", MD5Res.c_str());
+ SetTFRewriteData(Changes[End++], "MD5sum", Db.MD5Res.c_str());
+ SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str());
+ SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str());
SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str());
SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str());
SetTFRewriteData(Changes[End++], "Status", 0);
@@ -491,6 +497,10 @@ SourcesWriter::SourcesWriter(string BOverrides,string SOverrides,
else
NoOverride = true;
+ // WTF?? The logic above: if we can't read binary overrides, don't even try
+ // reading source overrides. if we can read binary overrides, then say there
+ // are no overrides. THIS MAKES NO SENSE! -- ajt@d.o, 2006/02/28
+
if (ExtOverrides.empty() == false)
SOver.ReadExtraOverride(ExtOverrides);
@@ -607,12 +617,14 @@ bool SourcesWriter::DoPackage(string FileName)
}
auto_ptr<Override::Item> SOverItem(SOver.GetItem(Tags.FindS("Source")));
- const auto_ptr<Override::Item> autoSOverItem(SOverItem);
+ // const auto_ptr<Override::Item> autoSOverItem(SOverItem);
if (SOverItem.get() == 0)
{
+ ioprintf(c1out, _(" %s has no source override entry\n"), Tags.FindS("Source").c_str());
SOverItem = auto_ptr<Override::Item>(BOver.GetItem(Tags.FindS("Source")));
if (SOverItem.get() == 0)
{
+ ioprintf(c1out, _(" %s has no binary override entry either\n"), Tags.FindS("Source").c_str());
SOverItem = auto_ptr<Override::Item>(new Override::Item);
*SOverItem = *OverItem;
}
@@ -657,7 +669,7 @@ bool SourcesWriter::DoPackage(string FileName)
realpath(OriginalPath.c_str(),RealPath) != 0)
{
string RP = RealPath;
- if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St) == false)
+ if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St.st_size) == false)
return false;
}
}
@@ -727,26 +739,14 @@ ContentsWriter::ContentsWriter(string DB) :
determine what the package name is. */
bool ContentsWriter::DoPackage(string FileName,string Package)
{
- // Open the archive
- FileFd F(FileName,FileFd::ReadOnly);
- if (_error->PendingError() == true)
- return false;
-
- // Stat the file for later
- struct stat St;
- if (fstat(F.Fd(),&St) != 0)
- return _error->Errno("fstat","Failed too stat %s",FileName.c_str());
-
- // Ready the DB
- if (Db.SetFile(FileName,St,&F) == false ||
- Db.LoadContents(false) == false)
+ if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false))
+ {
return false;
+ }
// Parse the package name
if (Package.empty() == true)
{
- if (Db.LoadControl() == false)
- return false;
Package = Db.Control.Section.FindS("Package");
}
@@ -896,6 +896,11 @@ bool ReleaseWriter::DoPackage(string FileName)
SHA1.AddFD(fd.Fd(), fd.Size());
CheckSums[NewFileName].SHA1 = SHA1.Result();
+ fd.Seek(0);
+ SHA256Summation SHA256;
+ SHA256.AddFD(fd.Fd(), fd.Size());
+ CheckSums[NewFileName].SHA256 = SHA256.Result();
+
fd.Close();
return true;
@@ -927,5 +932,16 @@ void ReleaseWriter::Finish()
(*I).second.size,
(*I).first.c_str());
}
+
+ fprintf(Output, "SHA256:\n");
+ for(map<string,struct CheckSum>::iterator I = CheckSums.begin();
+ I != CheckSums.end();
+ ++I)
+ {
+ fprintf(Output, " %s %16ld %s\n",
+ (*I).second.SHA256.c_str(),
+ (*I).second.size,
+ (*I).first.c_str());
+ }
}
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 16d014ef8..1d47d57ec 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -45,10 +45,11 @@ class FTWScanner
bool NoLinkAct;
static FTWScanner *Owner;
- static int Scanner(const char *File,const struct stat *sb,int Flag);
+ static int ScannerFTW(const char *File,const struct stat *sb,int Flag);
+ static int ScannerFile(const char *File, bool ReadLink);
bool Delink(string &FileName,const char *OriginalPath,
- unsigned long &Bytes,struct stat &St);
+ unsigned long &Bytes,off_t FileSize);
inline void NewLine(unsigned Priority)
{
@@ -84,6 +85,8 @@ class PackagesWriter : public FTWScanner
// Some flags
bool DoMD5;
+ bool DoSHA1;
+ bool DoSHA256;
bool NoOverride;
bool DoContents;
@@ -170,6 +173,7 @@ protected:
{
string MD5;
string SHA1;
+ string SHA256;
// Limited by FileFd::Size()
unsigned long size;
~CheckSum() {};
diff --git a/methods/connect.cc b/methods/connect.cc
index 4e48927ed..8c2ac6d56 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -103,6 +103,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
if (Err != 0)
{
errno = Err;
+ if(errno == ECONNREFUSED)
+ Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
Service,Name);
}
diff --git a/methods/ftp.cc b/methods/ftp.cc
index f595e0ca4..0c2aa00a7 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm)
UBuf.modtime = FailTime;
utime(FailFile.c_str(),&UBuf);
- // If the file is missing we hard fail otherwise transient fail
- if (Missing == true)
+ // If the file is missing we hard fail and delete the destfile
+ // otherwise transient fail
+ if (Missing == true) {
+ unlink(FailFile.c_str());
return false;
+ }
Fail(true);
return true;
}
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 5cb154f66..227e08d63 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -11,16 +11,18 @@
#include <errno.h>
#include <sys/wait.h>
#include <iostream>
+#include <sstream>
#define GNUPGPREFIX "[GNUPG:]"
#define GNUPGBADSIG "[GNUPG:] BADSIG"
#define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
#define GNUPGVALIDSIG "[GNUPG:] VALIDSIG"
+#define GNUPGNODATA "[GNUPG:] NODATA"
class GPGVMethod : public pkgAcqMethod
{
private:
- const char *VerifyGetSigners(const char *file, const char *outfile,
+ string VerifyGetSigners(const char *file, const char *outfile,
vector<string> &GoodSigners, vector<string> &BadSigners,
vector<string> &NoPubKeySigners);
@@ -32,11 +34,15 @@ class GPGVMethod : public pkgAcqMethod
GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
};
-const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
+string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
vector<string> &GoodSigners,
vector<string> &BadSigners,
vector<string> &NoPubKeySigners)
{
+ // setup a (empty) stringstream for formating the return value
+ std::stringstream ret;
+ ret.str("");
+
if (_config->FindB("Debug::Acquire::gpgv", false))
{
std::cerr << "inside VerifyGetSigners" << std::endl;
@@ -54,9 +60,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
std::cerr << "Keyring path: " << pubringpath << std::endl;
}
- if (stat(pubringpath.c_str(), &buff) != 0)
- return (string("Couldn't access keyring: ") + strerror(errno)).c_str();
-
+ if (stat(pubringpath.c_str(), &buff) != 0)
+ {
+ ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno));
+ return ret.str();
+ }
if (pipe(fd) < 0)
{
return "Couldn't create pipe";
@@ -65,7 +73,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
pid = fork();
if (pid < 0)
{
- return (string("Couldn't spawn new process") + strerror(errno)).c_str();
+ return string("Couldn't spawn new process") + strerror(errno);
}
else if (pid == 0)
{
@@ -164,7 +172,12 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
std::cerr << "Got NO_PUBKEY " << std::endl;
NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
-
+ if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::gpgv", false))
+ std::cerr << "Got NODATA! " << std::endl;
+ BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+ }
if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0)
{
char *sig = buffer + sizeof(GNUPGPREFIX);
@@ -189,7 +202,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
{
if (GoodSigners.empty())
return _("Internal error: Good signature, but could not determine key fingerprint?!");
- return NULL;
+ return "";
}
else if (WEXITSTATUS(status) == 1)
{
@@ -197,9 +210,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
}
else if (WEXITSTATUS(status) == 111)
{
- // FIXME String concatenation considered harmful.
- return (string(_("Could not execute ")) + gpgvpath +
- string(_(" to verify signature (is gnupg installed?)"))).c_str();
+ ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str());
+ return ret.str();
}
else
{
@@ -221,8 +233,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
URIStart(Res);
// Run gpgv on file, extract contents and get the key ID of the signer
- const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
- GoodSigners, BadSigners, NoPubKeySigners);
+ string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
+ GoodSigners, BadSigners, NoPubKeySigners);
if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty())
{
string errmsg;
@@ -247,7 +259,11 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
errmsg += (*I + "\n");
}
}
- return _error->Error(errmsg.c_str());
+ // this is only fatal if we have no good sigs or if we have at
+ // least one bad signature. good signatures and NoPubKey signatures
+ // happen easily when a file is signed with multiple signatures
+ if(GoodSigners.empty() or !BadSigners.empty())
+ return _error->Error(errmsg.c_str());
}
// Transfer the modification times
diff --git a/methods/http.cc b/methods/http.cc
index ba86aa6b6..09dab8188 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10;
unsigned long TimeOut = 120;
bool Debug = false;
+
+unsigned long CircleBuf::BwReadLimit=0;
+unsigned long CircleBuf::BwTickReadData=0;
+struct timeval CircleBuf::BwReadTick={0,0};
+const unsigned int CircleBuf::BW_HZ=10;
+
// CircleBuf::CircleBuf - Circular input buffer /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
{
Buf = new unsigned char[Size];
Reset();
+
+ CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
}
/*}}}*/
// CircleBuf::Reset - Reset to the default state /*{{{*/
@@ -90,16 +98,45 @@ void CircleBuf::Reset()
is non-blocking.. */
bool CircleBuf::Read(int Fd)
{
+ unsigned long BwReadMax;
+
while (1)
{
// Woops, buffer is full
if (InP - OutP == Size)
return true;
-
+
+ // what's left to read in this tick
+ BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
+
+ if(CircleBuf::BwReadLimit) {
+ struct timeval now;
+ gettimeofday(&now,0);
+
+ unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+ now.tv_usec-CircleBuf::BwReadTick.tv_usec;
+ if(d > 1000000/BW_HZ) {
+ CircleBuf::BwReadTick = now;
+ CircleBuf::BwTickReadData = 0;
+ }
+
+ if(CircleBuf::BwTickReadData >= BwReadMax) {
+ usleep(1000000/BW_HZ);
+ return true;
+ }
+ }
+
// Write the buffer segment
int Res;
- Res = read(Fd,Buf + (InP%Size),LeftRead());
+ if(CircleBuf::BwReadLimit) {
+ Res = read(Fd,Buf + (InP%Size),
+ BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
+ } else
+ Res = read(Fd,Buf + (InP%Size),LeftRead());
+ if(Res > 0 && BwReadLimit > 0)
+ CircleBuf::BwTickReadData += Res;
+
if (Res == 0)
return false;
if (Res < 0)
@@ -204,28 +241,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
if (Buf[I%Size] != '\n')
continue;
++I;
- if (I < InP && Buf[I%Size] == '\r')
- ++I;
if (Single == false)
{
- if (Buf[I%Size] != '\n')
- continue;
- ++I;
if (I < InP && Buf[I%Size] == '\r')
++I;
+ if (I >= InP || Buf[I%Size] != '\n')
+ continue;
+ ++I;
}
- if (I > InP)
- I = InP;
-
Data = "";
while (OutP < I)
{
unsigned long Sz = LeftWrite();
if (Sz == 0)
return false;
- if (I - OutP < LeftWrite())
+ if (I - OutP < Sz)
Sz = I - OutP;
Data += string((char *)(Buf + (OutP%Size)),Sz);
OutP += Sz;
@@ -682,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
- Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";
+ Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n";
if (Debug == true)
cerr << Req << endl;
@@ -787,7 +819,10 @@ bool HttpMethod::Flush(ServerState *Srv)
{
if (File != 0)
{
- SetNonBlock(File->Fd(),false);
+ // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
+ // can't be set
+ if (File->Name() != "/dev/null")
+ SetNonBlock(File->Fd(),false);
if (Srv->In.WriteSpace() == false)
return true;
@@ -815,7 +850,10 @@ bool HttpMethod::ServerDie(ServerState *Srv)
// Dump the buffer to the file
if (Srv->State == ServerState::Data)
{
- SetNonBlock(File->Fd(),false);
+ // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
+ // can't be set
+ if (File->Name() != "/dev/null")
+ SetNonBlock(File->Fd(),false);
while (Srv->In.WriteSpace() == true)
{
if (Srv->In.Write(File->Fd()) == false)
diff --git a/methods/http.h b/methods/http.h
index c5a4d0e86..541e2952c 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -31,6 +31,11 @@ class CircleBuf
unsigned long MaxGet;
struct timeval Start;
+ static unsigned long BwReadLimit;
+ static unsigned long BwTickReadData;
+ static struct timeval BwReadTick;
+ static const unsigned int BW_HZ;
+
unsigned long LeftRead()
{
unsigned long Sz = Size - (InP - OutP);
diff --git a/methods/makefile b/methods/makefile
index 1e3b1ef85..2e3abe55c 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
BIN := $(BIN)/methods
# FIXME..
-LIB_APT_PKG_MAJOR = 3.11
+LIB_APT_PKG_MAJOR = 3.51
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 000000000..545fe3e75
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,281 @@
+2006-07-19 Sunjae Park <darehanl@gmail.com>
+
+ * ko.po: Updated to 512t. Closes: #378901
+
+2006-07-02 SZERVAC Attila <sas@321.hu>
+
+ * hu.po: Updated to 512t. Closes: #376330
+
+2006-07-01 Leang Chumsoben <soben@khmeros.info>
+
+ * km.po: New Khmer translation: 506t6f. Closes: #375068
+
+2006-07-01 Shiva Pokharel <pokharelshiva@hotmail.com>
+
+ * ne.po: New Nepali translation: 512t. Closes: #373729
+
+2006-07-01 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Updated to 512t. Closes: #368038
+
+2006-07-01 Christian Perrier <bubulle@debian.org>
+
+ * zh_TW.po: Remove an extra %s in one string. Closes: #370551
+
+2006-07-01 Kinley Tshering <gasepkuenden2k3@hotmail.com>
+
+ * dz.po: New Dzongkha translation: 512t
+
+2006-06-25 Sorin Batariuc <sorin@bonbon.net>
+
+ * ro.po: Updated to 512t
+
+2006-06-21 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Updated
+
+2006-06-07 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Updated
+
+2006-05-29 Peter Mann <Peter.Mann@tuke.sk>
+
+ * sk.po: Completed to 512t
+
+2006-05-28 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Completed to 512t
+
+2006-05-17 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Completed to 512t
+
+2006-05-17 Daniel Nylander <yeager@lidkoping.net>
+
+ * sv.po: Completed to 512t
+
+2006-05-16 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO and the POT. Gives 506t6f for formerly
+ complete translations
+
+2006-04-01 Yavor Doganov <yavor@doganov.org>
+
+ * bg.po: Added, complete to 512t. Closes: #360262
+
+2006-03-16 eric pareja <xenos@upm.edu.ph>
+
+ * tl.po: Completed to 512t. Closes: #357215
+
+2006-03-13 Sorin Batariuc <sorin@bonbon.net>
+
+ * ro.po: Completed to 512t. Closes: #355897
+
+2006-03-12 Miguel Figueiredo <elmig@debianpt.org>
+
+ * pt.po: Completed to 512t. Closes: #355798
+
+2006-02-14 Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
+
+ * zh_CN.po: Completed to 512t. Closes: #353936
+
+2006-02-14 Samuele Giovanni Tonon <samu@debian.org>
+
+ * it.po: Completed to 512t. Closes: #352803
+
+2006-02-13 Andre Luis Lopes <andrelop@debian.org>
+
+ * ca.po: Completed to 512t. Closes: #352419
+
+2006-02-06 Jordi Mallach <jordi@debian.org>
+
+ * ca.po: Completed to 512t. Closes: #351592
+
+2006-01-30 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Completed to 512t. Closes: #350483
+
+2006-01-24 Kenshi Muto <kmuto@debian.org>
+
+ * ja.po: Completed to 512t. Closes: #349806
+
+2006-01-23 Bartosz Fenski aka fEnIo <fenio@debian.org>
+
+ * pl.po: Completed to 512t. Closes: #349514
+
+2006-01-23 Peter Mann <Peter.Mann@tuke.sk>
+
+ * sk.po: Completed to 512t. Closes: #349474
+
+2006-01-23 Jacobo Tarrio <jtarrio@trasno.net>
+
+ * gl.po: Completed to 512 strings
+ Closes: #349407
+
+2006-01-22 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Completed to 512 strings
+
+2006-01-21 Daniel Nylander <yeager@lidkoping.net>
+
+ * sv.po: Completed to 512 strings
+ Closes: #349210
+
+2006-01-21 Yuri Kozlov <kozlov.y@gmail.com>
+
+ * ru.po: Completed to 512 strings
+ Closes: #349154
+
+2006-01-21 Claus Hindsgaul <claus_h@image.dk>
+
+ * da.po: Completed to 512 strings
+ Closes: #349084
+
+2006-01-20 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+
+2006-01-20 Christian Perrier <bubulle@debian.org>
+
+ * *.po: Updated from sources (512 strings)
+
+2006-01-20 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Completed to 511 strings
+ Closes: #348968
+
+2006-01-18 Konstantinos Margaritis <markos@debian.org>
+
+ * el.po: Completed to 511 strings
+ Closes: #344642
+
+2005-11-07 Claus Hindsgaul <claus_h@image.dk>
+
+ * da.po: Completed to 511 strings
+ Closes: #348574
+
+2005-11-16 Andrew Deason <adeason@tjhsst.edu>
+
+ * en_GB.po: Minor errors correction
+
+2005-11-12 Ruben Porras <nahoo82@telefonica.net>
+
+ * es.po: Updated to 510t1f
+ Closes: #348158
+
+2005-11-12 Jacobo Tarrio <jacobo@tarrio.org>
+
+ * gl.po: Completed to 511 strings
+ Closes: #347729
+
+2006-01-10 Samuele Giovanni Tonon <samu@mclink.it>
+
+ * it.po: Yet another update
+ Closes: #347435
+
+2006-01-09 Jonas Koelker <jonaskoelker@users.sourceforge.net>
+
+ * en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+
+2006-01-09 Thomas Huriaux <thomas.huriaux@gmail.com>
+
+ * makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+
+2006-01-08 Daniel Nylander <yeager@lidkoping.net>
+
+ * sv.po: Completed to 511t. Closes: #346450
+
+2006-01-06 Peter Mann <Peter.Mann@tuke.sk>
+
+ * sk.po: Completed to 511t. Closes: #346369
+
+2006-01-06 Christian Perrier <bubulle@debian.org>
+
+ * *.po: Updated from sources (511 strings)
+ * fr.po: Completed to 511t
+
+2006-01-01 Samuele Giovanni Tonon <samu@mclink.it>
+
+ * it.po: Completed to 510t
+
+2006-01-01 Neil Williams <linux@codehelp.co.uk>
+
+ * en_GB.po: Completed to 510t
+
+2005-12-30 Miroslav Kure <kurem@upcase.inf.upol.cz>
+
+ * cs.po: Completed to 510t
+
+2005-12-25 Ming Hua <minghua@rice.edu>
+
+ * zh_CN.po: Completed to 510t
+
+2005-12-25 Konstantinos Margaritis <markos@debian.org>
+
+ * el.po: Updated to 510t
+
+2005-12-19 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Updated to 383t93f34u
+
+2005-12-19 eric pareja <xenos@upm.edu.ph>
+
+ * tl.po: Completed to 510 strings
+ Closes: #344306
+
+2005-12-19 Daniel Nylander <yeager@lidkoping.net>
+
+ * sv.po: Completed to 510 strings
+ Closes: #344056
+
+2005-11-29 Christian Perrier <bubulle@debian.org>
+
+ * LINGUAS: disabled Hebrew translation. Closes: #313283
+
+2005-12-05 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Completed to 510 strings
+ Closes: #342091
+
+2005-11-29 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Completed to 510 strings
+ * *.po : Synced with the POT files
+
+2005-11-14 Kov Tchai <tchaikov@sjtu.edu.cn>
+
+ * zh_CN.po: Completed to 510 strings
+ Definitely Closes: #338267
+
+2005-11-13 Kov Tchai <tchaikov@sjtu.edu.cn>
+
+ * zh_CN.po: Completed to 507 strings
+ Closes: #338267
+
+2005-11-09 Jacobo Tarrio <jacobo@tarrio.org>
+
+ * gl.po: Completed to 510 strings
+ Closes: #338356
+
+2005-11-08 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Completed to 510 strings
+ Closes: #338101
+
+2005-11-07 Claus Hindsgaul <claus_h@image.dk>
+
+ * da.po: Completed to 510 strings
+ Closes: #337949
+
+2005-11-04 Eric Pareja <xenos@upm.edu.ph>
+
+ * tl.po: Completed to 510 strings
+ Closes: #337306
+
+2005-11-04 Christian Perrier <bubulle@debian.org>
+
+ * Changelog: added to better track down fixed issues
+
diff --git a/po/LINGUAS b/po/LINGUAS
index ba7f30eb8..aec84e943 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-bs ca cs da de el en_GB es eu fi fr he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl zh_CN zh_TW
+bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 1caf832f0..586f9e545 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+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"
@@ -146,14 +146,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -192,6 +192,18 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr ""
@@ -231,7 +243,8 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
+#: apt-pkg/pkgcachegen.cc:819
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -315,115 +328,126 @@ msgstr ""
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr ""
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr ""
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr ""
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
+msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr ""
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -519,221 +543,221 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -741,74 +765,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -816,79 +840,97 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1444
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -896,158 +938,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1175,19 +1218,19 @@ msgstr ""
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -1248,7 +1291,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1301,7 +1344,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1331,9 +1375,11 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844 apt-pkg/pkgcachegen.cc:752
+#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+#: apt-pkg/pkgcachegen.cc:949
msgid "Reading package lists"
msgstr ""
@@ -1347,7 +1393,7 @@ msgstr ""
msgid "Internal error getting a package name"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr ""
@@ -1391,10 +1437,6 @@ msgstr ""
msgid "The pkg cache must be initialized first"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1465,12 +1507,12 @@ msgstr ""
msgid "File not found"
msgstr ""
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr ""
@@ -1596,7 +1638,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1619,7 +1661,7 @@ msgstr ""
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr ""
@@ -1648,69 +1690,70 @@ msgstr ""
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr ""
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1726,76 +1769,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr ""
@@ -1808,7 +1851,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938 apt-pkg/contrib/strutl.cc:981
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1929,7 +1972,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2005,143 +2048,157 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:126 apt-pkg/pkgcache.cc:137
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:143
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:148
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:142 apt-pkg/pkgcache.cc:153
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:147 apt-pkg/pkgcache.cc:158
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:220 apt-pkg/pkgcache.cc:231
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+msgid "Reading state information"
+msgstr ""
+
+#: apt-pkg/depcache.cc:199
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr ""
+
+#: apt-pkg/depcache.cc:205
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr ""
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 apt-pkg/cdrom.cc:450
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2159,19 +2216,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2185,9 +2242,16 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
msgstr ""
#: apt-pkg/acquire-worker.cc:113
@@ -2200,17 +2264,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122 apt-pkg/init.cc:125
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138 apt-pkg/init.cc:141
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2244,82 +2308,83 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131 apt-pkg/pkgcachegen.cc:134
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152 apt-pkg/pkgcachegen.cc:182
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156 apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190 apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194 apt-pkg/pkgcachegen.cc:225
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:255
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212 apt-pkg/pkgcachegen.cc:258
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215 apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243 apt-pkg/pkgcachegen.cc:292
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256 apt-pkg/pkgcachegen.cc:305
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262 apt-pkg/pkgcachegen.cc:311
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577 apt-pkg/pkgcachegen.cc:682
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662 apt-pkg/pkgcachegen.cc:767
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
msgid "IO Error saving source cache"
msgstr ""
@@ -2328,31 +2393,36 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
+#: apt-pkg/acquire-item.cc:980
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646 apt-pkg/acquire-item.cc:675
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759 apt-pkg/acquire-item.cc:788
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818 apt-pkg/acquire-item.cc:847
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854 apt-pkg/acquire-item.cc:883
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941 apt-pkg/acquire-item.cc:970
msgid "Size mismatch"
msgstr ""
@@ -2361,41 +2431,42 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:531
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:540
+#: apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr ""
@@ -2404,49 +2475,49 @@ msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:710 apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:726 apt-pkg/cdrom.cc:753
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:730 apt-pkg/cdrom.cc:757
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:754 apt-pkg/cdrom.cc:783
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:763 apt-pkg/cdrom.cc:792
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:803 apt-pkg/cdrom.cc:832
msgid "Unmounting CD-ROM..."
msgstr ""
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:261 apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:266 apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/indexcopy.cc:269 apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2493,14 +2564,35 @@ msgstr ""
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
+msgid "Completely removed %s"
msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:157
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc1)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:249
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc2)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:261
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:673
+#, c-format
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 000000000..7c783d194
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,2836 @@
+# Bulgarian translation of apt.
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the apt package.
+# Yavor Doganov <yavor@doganov.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt 0.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-03-31 22:05+0300\n"
+"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Пакет %s верÑÐ¸Ñ %s има неудовлетворена завиÑимоÑÑ‚:\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Пакетът %s не може да бъде намерен"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "Общо имена на пакети : "
+
+#: cmdline/apt-cache.cc:272
+msgid " Normal packages: "
+msgstr " Ðормални пакети: "
+
+#: cmdline/apt-cache.cc:273
+msgid " Pure virtual packages: "
+msgstr " ЧиÑти виртуални пакети: "
+
+#: cmdline/apt-cache.cc:274
+msgid " Single virtual packages: "
+msgstr " Единични виртуални пакети: "
+
+#: cmdline/apt-cache.cc:275
+msgid " Mixed virtual packages: "
+msgstr " СмеÑени виртуални пакети: "
+
+#: cmdline/apt-cache.cc:276
+msgid " Missing: "
+msgstr " ЛипÑващи: "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "Общо уникални верÑии: "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "Общо завиÑимоÑти: "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "Общо Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð²ÐµÑ€ÑиÑ/файл: "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "Общо Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ â€žÐžÑигурÑва“: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "Общо разгърнати низове: "
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "Общо проÑтранÑтво за завиÑимоÑти по верÑии: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "Общо празно проÑтранÑтво: "
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "Общо отчетено проÑтранÑтво: "
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "ПакетниÑÑ‚ файл %s не е Ñинхронизиран."
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "ТрÑбва да въведете Ñамо един израз"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "ÐÑма намерени пакети"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "Пакетни файлове:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Кешът не е Ñинхронизиран, не може да Ñе изпълни „x-ref“ на пакетен файл"
+
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "Отбити пакети:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(не Ñа намерени)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid " Installed: "
+msgstr " ИнÑталирана: "
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(нÑма)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid " Candidate: "
+msgstr " Кандидат: "
+
+#: cmdline/apt-cache.cc:1532
+msgid " Package pin: "
+msgstr " Отбиване на пакета: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid " Version table:"
+msgstr " Таблица Ñ Ð²ÐµÑ€Ñиите:"
+
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s за %s %s, компилиран на %s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Употреба: apt-cache [опции] команда\n"
+" apt-cache [опции] add файл1 [файл2 ...]\n"
+" apt-cache [опции] showpkg пакет1 [пакет2 ...]\n"
+" apt-cache [опции] showsrc пакет1 [пакет2 ...]\n"
+"\n"
+"apt-cache е инÑтрумент на ниÑко ниво за обработка на двоичните\n"
+"кеш файлове на APT и извличане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚ Ñ‚ÑÑ…\n"
+"\n"
+"Команди:\n"
+" add - Ð”Ð¾Ð±Ð°Ð²Ñ Ð¿Ð°ÐºÐµÑ‚ÐµÐ½ файл към кеша на пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код\n"
+" gencaches - Генериране на кеша на пакети и пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код\n"
+" showpkg - Показва обща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° даден пакет\n"
+" showsrc - Показва запиÑите на пакета Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код\n"
+" stats - Показва нÑкои общи ÑтатиÑтики\n"
+" dump - Показва Ñ†ÐµÐ»Ð¸Ñ Ñ„Ð°Ð¹Ð» в Ñбита форма\n"
+" dumpavail - Разпечатва наличен файл в stdout\n"
+" unmet - Показва неудовлетворени завиÑимоÑти\n"
+" search - ТърÑи в ÑпиÑъка Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸ за регулÑрен израз\n"
+" show - Показва Ð·Ð°Ð¿Ð¸Ñ Ð·Ð° пакета\n"
+" depends - Показва необработена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° завиÑимоÑти на пакета\n"
+" rdepends - Показва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° обратните завиÑимоÑти на пакета\n"
+" pkgnames - СпиÑък Ñ Ð¸Ð¼ÐµÐ½Ð°Ñ‚Ð° на вÑички пакети\n"
+" dotty - Генериране на графики на пакети за GraphVis\n"
+" xvcg - Генериране на графики на пакети за xvcg\n"
+" policy - Показване на наÑтройките на политиката\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" -p=? Кешът за пакети.\n"
+" -s=? Кешът за пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код.\n"
+" -q Премахване на индикатора за напредък.\n"
+" -i Показване Ñамо на важни завиÑимоÑти при командата „unmet“.\n"
+" -c=? Четене на този конфигурационен файл.\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ, Ñ‚.е. -o dir::cache=/"
+"tmp\n"
+"Вижте „man“ Ñтраниците apt-cache(8) и apt.conf(5) за повече информациÑ.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Задайте име за този диÑк, като „Debian 2.1r1 Disk1“"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Сложете диÑк в уÑтройÑтвото и натиÑнете „Enter“"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Повторете този Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð° оÑтаналите диÑкове от комплекта."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Ðргументите не Ñа по двойки"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-config [опции] команда\n"
+"\n"
+"apt-config е опроÑтен инÑтрумент за четене на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» на APT\n"
+"\n"
+"Команди:\n"
+" shell - Режим Ñ Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°\n"
+" dump - Показва конфигурациÑта\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" -c=? Четене на този конфигурационен файл.\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ, Ñ‚.е. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s не е валиден DEB пакет."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
+"\n"
+"apt-extracttemplates е инÑтрумент за извличане на конфигурационна "
+"информациÑ\n"
+"и шаблони от дебианÑки пакети\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" -t ÐаÑтройване на временна директориÑ\n"
+" -c=? Четене на този конфигурационен файл.\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ, Ñ‚.е. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ÐеуÑпех при запиÑа на %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ðе може да Ñе извлече верÑиÑта на debconf. Debconf инÑталиран ли е?"
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "СпиÑъкът Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð½Ð° пакети и твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Грешка при обработката на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ %s"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "СпиÑъкът Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð½Ð° източници е твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "Грешка при запазването на заглавната чаÑÑ‚ във файла ÑÑŠÑ Ñъдържание"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Грешка при обработката на Ñъдържание %s"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"Употреба: apt-ftparchive [опции] команда\n"
+"Команди: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents път\n"
+" release път\n"
+" generate config [групи]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive генерира индекÑни файлове за архиви на Debian. Поддържа\n"
+"много Ñтилове на генериране от напълно автоматично до функционални\n"
+"замени на dpkg-scanpackages и dpkg-scansources.\n"
+"\n"
+"apt-ftparchive генерира „Package“ файлове от дърво Ñ .deb файлове. Файлът\n"
+"„Package“ предÑтавлÑва Ñъдържанието на вÑички контролни полета на вÑеки\n"
+"пакет, както и MD5 хеш и размер на файла. СтойноÑтите на полетата \n"
+"„Priority“ и „Section“ могат да бъдат изменени Ñ Ñ„Ð°Ð¹Ð» „override“.\n"
+"\n"
+"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво Ñ .dsc \n"
+"файлове. ОпциÑта --source-override може да Ñе използва за указване на файл\n"
+"„override“ за пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код.\n"
+"\n"
+"Командите „packages“ и „sources“ Ñ‚Ñ€Ñбва да Ñе изпълнÑват в корена на "
+"дървото.\n"
+"BinaryPath Ñ‚Ñ€Ñбва да Ñочи към оÑновата, където започва рекурÑивното Ñ‚ÑŠÑ€Ñене "
+"и\n"
+"файла „override“ Ñ‚Ñ€Ñбва да Ñъдържа вÑички флагове за преназначаване. "
+"Pathprefix\n"
+"Ñе Ð¿Ñ€Ð¸Ð±Ð°Ð²Ñ ÐºÑŠÐ¼ полетата на файловите имена, ако ÑъщеÑтвува. Пример за "
+"употреба\n"
+"от архива на Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" --md5 Управление на генерирането на MD5.\n"
+" -s=? Файл „override“ за пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код.\n"
+" -q Без показване на ÑъобщениÑ.\n"
+" -d=? Избор на допълнителна база от данни за кеширане.\n"
+" --no-delink Включване на режим за премахване на връзки.\n"
+" --contents Управление на генерирането на файлове ÑÑŠÑ Ñъдържание.\n"
+" -c=? Четене на този конфигурационен файл.\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "ÐÑма ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð° избора"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ЛипÑват нÑкои файлове от групата Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ пакети „%s“"
+
+#: ftparchive/cachedb.cc:47
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД е повредена, файлът е преименуван на %s.old"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД е Ñтара, опит за актуализиране на %s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ÐеуÑпех при отварÑнето на файл %s от БД: %s"
+
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Грешка при получаването на атрибути за %s"
+
+#: ftparchive/cachedb.cc:242
+msgid "Archive has no control record"
+msgstr "Ð’ архива нÑма поле „control“"
+
+#: ftparchive/cachedb.cc:448
+msgid "Unable to get a cursor"
+msgstr "ÐеуÑпех при получаването на курÑор"
+
+#: ftparchive/writer.cc:79
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: ÐеуÑпех при четенето на Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ %s\n"
+
+#: ftparchive/writer.cc:84
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: ÐеуÑпех при четенето на %s\n"
+
+#: ftparchive/writer.cc:135
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:137
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:144
+msgid "E: Errors apply to file "
+msgstr "E: Грешките Ñе отнаÑÑÑ‚ за файла "
+
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "ÐеуÑпех при превръщането на %s"
+
+#: ftparchive/writer.cc:173
+msgid "Tree walking failed"
+msgstr "ÐеуÑпех при обхода на дървото"
+
+#: ftparchive/writer.cc:198
+#, c-format
+msgid "Failed to open %s"
+msgstr "ÐеуÑпех при отварÑнето на %s"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:265
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "ÐеуÑпех при прочитането на връзка %s"
+
+#: ftparchive/writer.cc:269
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "ÐеуÑпех при премахването на връзка %s"
+
+#: ftparchive/writer.cc:276
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** ÐеуÑпех при Ñъздаването на връзка %s към %s"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "Превишен лимит на DeLink от %sB.\n"
+
+#: ftparchive/writer.cc:390
+msgid "Archive had no package field"
+msgstr "Ðрхивът нÑма поле „package“"
+
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s нÑма Ð·Ð°Ð¿Ð¸Ñ â€žoverride“\n"
+
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð°Ñ‰Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s е %s, а не %s\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s нÑма Ð·Ð°Ð¿Ð¸Ñ â€žoverride“\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s нÑма Ð·Ð°Ð¿Ð¸Ñ â€žoverride“\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Вътрешна грешка, неуÑпех при намирането на ÑÑŠÑтавна чаÑÑ‚ %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - ÐеуÑпех при заделÑнето на памет"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "ÐеуÑпех при отварÑнето на %s"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Ðеправилно форматиран override %s, ред %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Ðеправилно форматиран override %s, ред %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Ðеправилно форматиран override %s, ред %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ÐеуÑпех при четенето на override файл %s"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ðепознат алгоритъм за компреÑÐ¸Ñ â€ž%s“"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "КомпреÑираниÑÑ‚ изход %s изиÑква наÑтройка за компреÑирането"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "ÐеуÑпех при Ñъздаването на IPC pipe към подпроцеÑа"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "ÐеуÑпех при Ñъздаването на FILE*"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "ÐеуÑпех при пуÑкането на подпроцеÑ"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "ПроцеÑ-потомък за компреÑиране"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Вътрешна грешка, неуÑпех при Ñъздаването на %s"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "ÐеуÑпех при Ñъздаването на Ð¿Ð¾Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑ IPC"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "ÐеуÑпех при изпълнението на компреÑиращата програма "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "декомпреÑираща програма"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "Ð’/И към подпроцеÑа/файла пропадна"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "ÐеуÑпех при четене докато Ñе изчиÑлÑва MD5"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "ÐеуÑпех при премахването на връзка на %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ÐеуÑпех при преименуването на %s на %s"
+
+#: cmdline/apt-get.cc:121
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð· - %s"
+
+#: cmdline/apt-get.cc:238
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени завиÑимоÑти:"
+
+#: cmdline/apt-get.cc:328
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инÑталиран %s"
+
+#: cmdline/apt-get.cc:330
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инÑталиран %s"
+
+#: cmdline/apt-get.cc:337
+msgid "but it is not installable"
+msgstr "но той не може да бъде инÑталиран"
+
+#: cmdline/apt-get.cc:339
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not installed"
+msgstr "но той не е инÑталиран"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not going to be installed"
+msgstr "но той нÑма да бъде инÑталиран"
+
+#: cmdline/apt-get.cc:347
+msgid " or"
+msgstr " или"
+
+#: cmdline/apt-get.cc:376
+msgid "The following NEW packages will be installed:"
+msgstr "Следните ÐОВИ пакети ще бъдат инÑталирани:"
+
+#: cmdline/apt-get.cc:402
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМÐÐ¥ÐÐТИ:"
+
+#: cmdline/apt-get.cc:424
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети нÑма да бъдат променени:"
+
+#: cmdline/apt-get.cc:445
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: cmdline/apt-get.cc:466
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРÐÐТИ КЪМ ПО-СТÐРРВЕРСИЯ:"
+
+#: cmdline/apt-get.cc:486
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: cmdline/apt-get.cc:539
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (поради %s) "
+
+#: cmdline/apt-get.cc:547
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ПРЕДУПРЕЖДЕÐИЕ: Следните необходими пакети ще бъдат премахнати.\n"
+"Това ÐЕ би Ñ‚Ñ€Ñбвало да Ñтава оÑвен ако знаете точно какво правите!"
+
+#: cmdline/apt-get.cc:578
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инÑталирани, "
+
+#: cmdline/apt-get.cc:582
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинÑталирани, "
+
+#: cmdline/apt-get.cc:584
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-Ñтара верÑиÑ, "
+
+#: cmdline/apt-get.cc:586
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промÑна.\n"
+
+#: cmdline/apt-get.cc:590
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не Ñа напълно инÑталирани или премахнати.\n"
+
+#: cmdline/apt-get.cc:650
+msgid "Correcting dependencies..."
+msgstr "Коригиране на завиÑимоÑтите..."
+
+#: cmdline/apt-get.cc:653
+msgid " failed."
+msgstr " пропадна."
+
+#: cmdline/apt-get.cc:656
+msgid "Unable to correct dependencies"
+msgstr "ÐеуÑпех при коригирането на завиÑимоÑтите"
+
+#: cmdline/apt-get.cc:659
+msgid "Unable to minimize the upgrade set"
+msgstr "ÐеуÑпех при минимизирането на набора актуализации"
+
+#: cmdline/apt-get.cc:661
+msgid " Done"
+msgstr " Готово"
+
+#: cmdline/apt-get.cc:665
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправноÑти."
+
+#: cmdline/apt-get.cc:668
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ðеудовлетворени завиÑимоÑти. Опитайте Ñ â€ž-f“."
+
+#: cmdline/apt-get.cc:690
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ПРЕДУПРЕЖДЕÐИЕ: Следните пакети не могат да бъдат удоÑтоверени!"
+
+#: cmdline/apt-get.cc:694
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждението за удоÑтоверÑването е пренебрегнато.\n"
+
+#: cmdline/apt-get.cc:701
+msgid "Install these packages without verification [y/N]? "
+msgstr "ИнÑталиране на тези пакети без проверка [y/N]?"
+
+#: cmdline/apt-get.cc:703
+msgid "Some packages could not be authenticated"
+msgstr "ÐÑкои пакети не можаха да бъдат удоÑтоверени"
+
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
+
+#: cmdline/apt-get.cc:756
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при Ñчупени пакети!"
+
+#: cmdline/apt-get.cc:765
+msgid "Packages need to be removed but remove is disabled."
+msgstr "ТрÑбва да бъдат премахнати пакети, но премахването е изключено."
+
+#: cmdline/apt-get.cc:776
+msgid "Internal error, Ordering didn't finish"
+msgstr "Вътрешна грешка, „Ordering“ не завърши"
+
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
+msgid "Unable to lock the download directory"
+msgstr "ÐеуÑпех при заключването на директориÑта за изтеглÑне"
+
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "СпиÑъкът Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ не можа да бъде прочетен."
+
+#: cmdline/apt-get.cc:817
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Странно.. Размерите не Ñъвпадат, изпратете е-поща на apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:822
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB/%sB архиви.\n"
+
+#: cmdline/apt-get.cc:825
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB архиви.\n"
+
+#: cmdline/apt-get.cc:830
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "След разпакетирането ще бъде използвано %sB диÑково проÑтранÑтво.\n"
+
+#: cmdline/apt-get.cc:833
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "След разпакетирането ще бъде оÑвободено %sB диÑково проÑтранÑтво.\n"
+
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "ÐеуÑпех при определÑнето на Ñвободното проÑтранÑтво в %s"
+
+#: cmdline/apt-get.cc:850
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "ÐÑмате доÑтатъчно Ñвободно проÑтранÑтво в %s."
+
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Указано е „Trivial Only“, но това не е тривиална операциÑ."
+
+#: cmdline/apt-get.cc:867
+msgid "Yes, do as I say!"
+msgstr "Да, прави каквото казвам!"
+
+#: cmdline/apt-get.cc:869
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Ðа път Ñте да направите нещо потенциално опаÑно.\n"
+"За да продължите, въведете фразата „%s“\n"
+" ?] "
+
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
+msgid "Abort."
+msgstr "ПрекъÑване."
+
+#: cmdline/apt-get.cc:890
+msgid "Do you want to continue [Y/n]? "
+msgstr "ИÑкате ли да продължите [Y/n]? "
+
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "ÐеуÑпех при изтеглÑнето на %s %s\n"
+
+#: cmdline/apt-get.cc:980
+msgid "Some files failed to download"
+msgstr "ÐÑкои файлове не можаха да бъдат изтеглени"
+
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
+msgid "Download complete and in download only mode"
+msgstr "ИзтеглÑнето завърши в режим Ñамо на изтеглÑне"
+
+#: cmdline/apt-get.cc:987
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"ÐеуÑпех при изтеглÑнето на нÑкои архиви, може да изпълните „apt-get update“ "
+"или да опитате Ñ â€ž--fix-missing“?"
+
+#: cmdline/apt-get.cc:991
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "„--fix-missing“ и превключване на ноÑители не Ñе поддържа вÑе още"
+
+#: cmdline/apt-get.cc:996
+msgid "Unable to correct missing packages."
+msgstr "ÐеуÑпех при коригирането на липÑващите пакети."
+
+#: cmdline/apt-get.cc:997
+msgid "Aborting install."
+msgstr "ПрекъÑване на инÑталирането."
+
+#: cmdline/apt-get.cc:1031
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Забележете, избиране на %s вмеÑто %s\n"
+
+#: cmdline/apt-get.cc:1041
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "ПропуÑкане на %s, вече е инÑталиран и не е маркиран за актуализациÑ.\n"
+
+#: cmdline/apt-get.cc:1059
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Пакетът %s не е инÑталиран, така че не е премахнат\n"
+
+#: cmdline/apt-get.cc:1070
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Пакетът %s е виртуален пакет, оÑигурен от:\n"
+
+#: cmdline/apt-get.cc:1082
+msgid " [Installed]"
+msgstr " [ИнÑталиран]"
+
+#: cmdline/apt-get.cc:1087
+msgid "You should explicitly select one to install."
+msgstr "ТрÑбва изрично да изберете един за инÑталиране."
+
+#: cmdline/apt-get.cc:1092
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Пакетът %s не е наличен, но е в ÑпиÑъка ÑÑŠÑ Ð·Ð°Ð²Ð¸ÑимоÑти на друг пакет.\n"
+"Това може да означава, че пакета липÑва, оÑтарÑл е, или е доÑтъпен\n"
+"Ñамо от друг източник\n"
+
+#: cmdline/apt-get.cc:1111
+msgid "However the following packages replace it:"
+msgstr "Обаче Ñледните пакети го замеÑтват:"
+
+#: cmdline/apt-get.cc:1114
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Пакетът %s нÑма кандидат за инÑталиране"
+
+#: cmdline/apt-get.cc:1134
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ПреинÑталациÑта на %s не е възможна, не може да бъде изтеглен.\n"
+
+#: cmdline/apt-get.cc:1142
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s вече е най-новата верÑиÑ.\n"
+
+#: cmdline/apt-get.cc:1171
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ðе е намерено издание „%s“ на „%s“"
+
+#: cmdline/apt-get.cc:1173
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ðе е намерена верÑÐ¸Ñ â€ž%s“ на „%s“"
+
+#: cmdline/apt-get.cc:1179
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Избрана е верÑÐ¸Ñ %s (%s) за %s\n"
+
+#: cmdline/apt-get.cc:1316
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: cmdline/apt-get.cc:1329
+msgid "Unable to lock the list directory"
+msgstr "ÐеуÑпех при заключването на директориÑта ÑÑŠÑ ÑпиÑъка на пакетите"
+
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ÐÑкои индекÑни файлове не можаха да бъдат изтеглени, те Ñа пренебрегнати или "
+"Ñа използвани по-Ñтари."
+
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Следната Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ðµ да помогне за намиране на изход от ÑитуациÑта:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Вътрешна грешка, „problem resolver“ Ñчупи нещо в ÑиÑтемата"
+
+#: cmdline/apt-get.cc:1463
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Вътрешна грешка, „AllUpgrade“ Ñчупи нещо в ÑиÑтемата"
+
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "ÐеуÑпех при намирането на пакет %s"
+
+#: cmdline/apt-get.cc:1584
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Забележете, избиране на %s за регулÑрен израз „%s“\n"
+
+#: cmdline/apt-get.cc:1614
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
+
+#: cmdline/apt-get.cc:1617
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Ðеудовлетворени завиÑимоÑти. Опитайте „apt-get -f install“ без пакети (или "
+"укажете разрешение)."
+
+#: cmdline/apt-get.cc:1629
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"ÐÑкои пакети не можаха да бъдат инÑталирани. Това може да означава,\n"
+"че Ñте изиÑкали невъзможна ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ Ð¸Ð»Ð¸ ако използвате неÑтабилната\n"
+"диÑтрибуциÑ, че нÑкои необходими пакети още не Ñа Ñъздадени или пък\n"
+"Ñа били премеÑтени от Incoming."
+
+#: cmdline/apt-get.cc:1637
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"Тъй като Ñте указали единична операциÑ, твърде е възможно пакета проÑто\n"
+"да не може да бъде инÑталиран; в такъв Ñлучай би Ñ‚Ñ€Ñбвало да Ñе подаде\n"
+"доклад за грешка за този пакет."
+
+#: cmdline/apt-get.cc:1645
+msgid "Broken packages"
+msgstr "Счупени пакети"
+
+#: cmdline/apt-get.cc:1676
+msgid "The following extra packages will be installed:"
+msgstr "Следните допълнителни пакети ще бъдат инÑталирани:"
+
+#: cmdline/apt-get.cc:1765
+msgid "Suggested packages:"
+msgstr "Предложени пакети:"
+
+#: cmdline/apt-get.cc:1766
+msgid "Recommended packages:"
+msgstr "Препоръчвани пакети:"
+
+#: cmdline/apt-get.cc:1786
+msgid "Calculating upgrade... "
+msgstr "ИзчиÑлÑване на актуализациÑта..."
+
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "ÐеуÑпех"
+
+#: cmdline/apt-get.cc:1794
+msgid "Done"
+msgstr "Готово"
+
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Вътрешна грешка, „problem resolver“ Ñчупи нещо в ÑиÑтемата"
+
+#: cmdline/apt-get.cc:1969
+msgid "Must specify at least one package to fetch source for"
+msgstr "ТрÑбва да укажете поне един пакет за изтеглÑне на Ð¸Ð·Ñ…Ð¾Ð´Ð½Ð¸Ñ Ð¼Ñƒ код"
+
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "ÐеуÑпех при намирането на изходен код на пакет %s"
+
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ПропуÑкане на вече Ð¸Ð·Ñ‚ÐµÐ³Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“\n"
+
+#: cmdline/apt-get.cc:2067
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "ÐÑмате доÑтатъчно Ñвободно проÑтранÑтво в %s"
+
+#: cmdline/apt-get.cc:2072
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB/%sB архиви изходен код.\n"
+
+#: cmdline/apt-get.cc:2075
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB архиви изходен код.\n"
+
+#: cmdline/apt-get.cc:2081
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ИзтеглÑне на изходен код %s\n"
+
+#: cmdline/apt-get.cc:2112
+msgid "Failed to fetch some archives."
+msgstr "ÐеуÑпех при изтеглÑнето на нÑкои архиви."
+
+#: cmdline/apt-get.cc:2140
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"ПропуÑкане на разпакетирането на вече Ñ€Ð°Ð·Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код в %s\n"
+
+#: cmdline/apt-get.cc:2152
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Командата за разпакетиране „%s“ пропадна.\n"
+
+#: cmdline/apt-get.cc:2153
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Проверете дали имате инÑталиран пакета „dpkg-dev“.\n"
+
+#: cmdline/apt-get.cc:2170
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Командата за компилиране „%s“ пропадна.\n"
+
+#: cmdline/apt-get.cc:2189
+msgid "Child process failed"
+msgstr "ПроцеÑÑŠÑ‚-потомък пропадна"
+
+#: cmdline/apt-get.cc:2205
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"ТрÑбва да укажете поне един пакет за проверка на завиÑимоÑти за компилиране"
+
+#: cmdline/apt-get.cc:2233
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+"ÐеуÑпех при получаването на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° завиÑимоÑтите за компилиране на %s"
+
+#: cmdline/apt-get.cc:2253
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s нÑма завиÑимоÑти за компилиране.\n"
+
+#: cmdline/apt-get.cc:2305
+#, 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:2357
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"ЗавиÑимоÑÑ‚ %s за пакета %s не може да бъде удовлетворена, понеже нÑма "
+"налични верÑии на пакета %s, които могат да удовлетворÑÑ‚ изиÑкването за "
+"верÑиÑ"
+
+#: cmdline/apt-get.cc:2392
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"ÐеуÑпех при удовлетворÑването на завиÑимоÑÑ‚ %s за пакета %s: ИнÑталираниÑÑ‚ "
+"пакет %s е твърде нов"
+
+#: cmdline/apt-get.cc:2417
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "ÐеуÑпех при удовлетворÑването на завиÑимоÑÑ‚ %s за пакета %s: %s"
+
+#: cmdline/apt-get.cc:2431
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "ЗавиÑимоÑтите за компилиране на %s не можаха да бъдат удовлетворени."
+
+#: cmdline/apt-get.cc:2435
+msgid "Failed to process build dependencies"
+msgstr "ÐеуÑпех при обработката на завиÑимоÑтите за компилиране"
+
+#: cmdline/apt-get.cc:2467
+msgid "Supported modules:"
+msgstr "Поддържани модули:"
+
+#: cmdline/apt-get.cc:2508
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"Употреба: apt-get [опции] команда\n"
+" apt-get [опции] install|remove пакет1 [пакет2 ...]\n"
+" apt-get [опции] source пакет1 [пакет2 ...]\n"
+"\n"
+"apt-get е опроÑтен Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð·Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´ за изтеглÑне и\n"
+"инÑталиране на пакети. Ðай-чеÑто използваните команди Ñа „update“\n"
+"и „install“.\n"
+"\n"
+"Команди:\n"
+" update - Зареждане на нови ÑпиÑъци Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸\n"
+" upgrade - Извършване на актуализиране\n"
+" install - ИнÑталиране на нови пакети (пакет е libc6, а не libc6.deb)\n"
+" remove - Премахване на пакети\n"
+" source - ИзтеглÑне на изходен код на пакети\n"
+" build-dep - Конфигуриране на завиÑимоÑтите за компилиране за изходен код "
+"на пакети\n"
+" dist-upgrade - Ðктуализиране на диÑтрибуциÑта, вижте apt-get(8)\n"
+" dselect-upgrade - Следване на избора на dselect\n"
+" clean - Изтриване на изтеглените файлове\n"
+" autoclean - Изтриване на Ñтари изтеглени файлове\n"
+" check - Проверка за Ñчупени завиÑимоÑти\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" -q Изход на ÑъобщениÑ, подходÑщи за журнал - без индикатор на напредъка\n"
+" -qq Без изход на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñвен при грешки\n"
+" -d Само изтеглÑне - да ÐЕ Ñе инÑталират или разпакетират архивите\n"
+" -s Без дейÑтвие. Предизвикване на ÑимулациÑ.\n"
+" -y ОтговарÑне Ñ â€žÐ”Ð°â€œ на вÑички въпроÑи, без питане\n"
+" -f Опит за продължаване дори и при неуÑпех на проверката за цÑлоÑÑ‚\n"
+" -m Опит за продължаване дори и ако архивите Ñа неоткриваеми\n"
+" -u Показване на ÑпиÑък Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ‚Ðµ Ñа актуализиране\n"
+" -b Компилиране на Ð¸Ð·Ñ…Ð¾Ð´Ð½Ð¸Ñ ÐºÐ¾Ð´ на пакета Ñлед изтеглÑнето му\n"
+" -V Показване на подробни верÑии\n"
+" -c=? Четене на този конфигурационен файл\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ, Ñ‚.е. -o dir::cache=/"
+"tmp\n"
+"Вижте Ñтраниците на apt-get(8), sources.list(5) и apt.conf(5) за повече\n"
+"Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ опции.\n"
+" Това APT има Върховни Сили.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Поп "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Изт:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Игн "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Грш "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Изтеглени %sB за %s (%sB/Ñек)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Ð’ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° работа]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"СмÑна на ноÑител: Ñложете диÑка Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚\n"
+" „%s“\n"
+"в уÑтройÑтвото „%s“ и натиÑнете „Enter“\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Ðепознат Ð·Ð°Ð¿Ð¸Ñ Ð·Ð° пакет!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
+"\n"
+"apt-sortpkgs е опроÑтен инÑтрумент за Ñортиране на пакетни файлове. ОпциÑта\n"
+"„-s“ Ñе използва, за да покаже типа на файла.\n"
+"\n"
+"Опции:\n"
+" -h Този помощен текÑÑ‚.\n"
+" -s Използване на Ñортиране по изходен код.\n"
+" -c=? Четене на този конфигурационен файл.\n"
+" -o=? ÐаÑтройване на произволна конфигурационна опциÑ, Ñ‚.е. -o dir::cache=/"
+"tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Лоша Ñтандартна наÑтройка!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "ÐатиÑнете „Enter“, за да продължите."
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Възникнаха нÑкои грешки при разпакетирането. Ще Ñе конфигурират"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "инÑталираните пакети. Това може да доведе до дублирани грешки или"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "грешки, причинени от липÑващи завиÑимоÑти. Това е наред, Ñамо грешките"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"над това Ñъобщение за важни. Коригирайте ги и изпълнете [I]nstall наново"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "СмеÑване на наличната информациÑ"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "ÐеуÑпех при Ñъздаването на програмни канали"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "ÐеуÑпех при изпълнението на gzip"
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
+msgid "Corrupted archive"
+msgstr "Развален архив"
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "ÐевÑрна контролна Ñума на tar, развален архив"
+
+#: apt-inst/contrib/extracttar.cc:299
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ðепозната заглавна чаÑÑ‚ на TAR тип %u, елемент %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "Ðевалиден Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° архива"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "Грешка при четене на заглавната чаÑÑ‚ на елемента на архива"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Ðевалидна заглавна чаÑÑ‚ на елемента на архива"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "Ðрхивът е твърде кратък"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "ÐеуÑпех при четенето на заглавните чаÑти на архива"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "Извикан е DropNode за вÑе още използван възел"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "Грешка при намирането на хеш-елемента!"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "ÐеуÑпех при уÑтановÑване на отклонението"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "Вътрешна грешка в AddDiversion"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойно добавÑне на отклонение %s -> %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Дублиран конфигурационен файл %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл %s"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "ÐеуÑпех при затварÑнето на файл %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "ПътÑÑ‚ %s е твърде дълъг"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Разпакетиране на %s повече от веднъж"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "ДиректориÑта %s е отклонена"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Пакетът Ñе опитва да пише в целта за отклонение %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "ПътÑÑ‚ за отклонение е твърде дълъг"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ДиректориÑта %s Ñе Ð·Ð°Ð¼ÐµÐ½Ñ Ñ Ð½Ðµ-директориÑ"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "ÐеуÑпех при намирането на възел в Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ Ñ…ÐµÑˆ"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "ПътÑÑ‚ е твърде дълъг"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Файловете Ñе заменÑÑ‚ ÑÑŠÑ Ñъдържанието на пакета %s без верÑиÑ"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Файл %s/%s Ð·Ð°Ð¼ÐµÐ½Ñ Ñ‚Ð¾Ð·Ð¸ в пакет %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "ÐеуÑпех при четенето на %s"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "ÐеуÑпех при получаването на атрибути за %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "ÐеуÑпех при премахването на %s"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "ÐеуÑпех при Ñъздаването на %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "ÐеуÑпех при получаването на атрибути %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Директориите info и temp Ñ‚Ñ€Ñбва да бъдат на една и Ñъща файлова ÑиÑтема"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
+msgid "Reading package lists"
+msgstr "Четене на ÑпиÑъците Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "ÐеуÑпех при преминаването в админиÑтраторÑката Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Вътрешна грешка при получаването на името на пакета"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Четене на ÑпиÑъка на файловете"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"ÐеуÑпех при отварÑнето на ÑпиÑъка Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ „%sinfo/%s“. Ðко не може да "
+"възÑтановите този файл, запишете го като празен и веднага преинÑталирайте "
+"Ñъщата верÑÐ¸Ñ Ð½Ð° пакета!"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "ÐеуÑпех при четенето на ÑпиÑъка Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Вътрешна грешка при получаването на възел"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "ÐеуÑпех при отварÑнето на файл Ñ Ð¾Ñ‚ÐºÐ»Ð¾Ð½ÐµÐ½Ð¸Ñ %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Файлът Ñ Ð¾Ñ‚ÐºÐ»Ð¾Ð½ÐµÐ½Ð¸Ñ Ðµ повреден"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Ðеправилен ред във файла Ñ Ð¾Ñ‚ÐºÐ»Ð¾Ð½ÐµÐ½Ð¸Ñ: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Вътрешна грешка при добавÑнето на отклонение"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Първо Ñ‚Ñ€Ñбва да Ñе инициализира кеша Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "ÐеуÑпех при намирането на заглавна чаÑÑ‚ „Package:“, измеÑтване %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Ðеправилна ÑÐµÐºÑ†Ð¸Ñ â€žConfFile“ във файла за ÑÑŠÑтоÑние. ИзмеÑтване %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Грешка при анализирането на MD5. ИзмеÑтване %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Това не е валиден DEB архив, липÑва елемент „%s“"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "Това не е валиден DEB архив, нÑма елемент „%s“ или „%s“"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "ÐеуÑпех при преминаването в %s"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "Вътрешна грешка, не може да Ñе открие елемент"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "ÐеуÑпех при намирането на валиден контролен файл"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "Контролен файл, невъзможен за анализ"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "ÐеуÑпех при четенето на базата %s ÑÑŠÑ CD-ROM"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Използвайте „apt-cdrom“, за да може този CD-ROM да Ñе разпознава от APT. "
+"„apt-get update“ не може да Ñе използва за добавÑне на нови диÑкове"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "Грешен CD-ROM"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "ÐеуÑпех при демонтирането на CD-ROM в %s, може вÑе още да Ñе използва."
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "ДиÑкът не е намерен."
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Файлът не е намерен"
+
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "ÐеуÑпех при получаването на атрибути"
+
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "ÐеуÑпех при задаването на време на промÑна"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Ðевалиден адреÑ-URI, локалните адреÑи-URI не Ñ‚Ñ€Ñбва да започват Ñ â€ž//“"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Влизане"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "ÐеуÑпех при уÑтановÑването на името на Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ñървър"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "ÐеуÑпех при уÑтановÑването на локалното име"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Сървърът отказа Ñвързване и Ñъобщи: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER Ñе провали, Ñървърът Ñъобщи: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS Ñе провали, Ñървърът Ñъобщи: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Беше указан Ñървър-поÑредник, но нÑма Ñкрипт за влизане, Acquire::ftp::"
+"ProxyLogin е празен."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Командата „%s“ на Ñкрипта за влизане Ñе провали, Ñървърът Ñъобщи: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE Ñе провали, Ñървърът Ñъобщи: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "ДопуÑтимото време за Ñвързването изтече"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Сървърът разпадна връзката"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Грешка при четене"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Отговорът препълни буфера."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Развален протокол"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Грешка при запиÑ"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "ÐеуÑпех при Ñъздаването на гнездо"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr ""
+"ÐеуÑпех при Ñвързването на гнездо за данни, допуÑтимото време за Ñвъзрзване "
+"изтече"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "ÐеуÑпех при Ñвързването на паÑивно гнездо."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo не уÑÐ¿Ñ Ð´Ð° Ñе добере до Ñлушащо гнездо"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "ÐеуÑпех при Ñвързването на гнездо"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "ÐеуÑпех при Ñлушането на гнездото"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "ÐеуÑпех при определÑнето на името на гнездото"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "ÐеуÑпех при изпращането на командата PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "ÐеизвеÑтно ÑемейÑтво адреÑи %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT Ñе провали, Ñървърът Ñъобщи: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Времето за уÑтановÑване на връзка Ñ Ð³Ð½ÐµÐ·Ð´Ð¾ за данни изтече"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Ðевъзможно е да Ñе приеме Ñвързването"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Проблем при хеширане на файла"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "ÐеуÑпех при изтеглÑнето на файла, Ñървърът Ñъобщи „%s“"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Времето за връзка Ñ Ð³Ð½ÐµÐ·Ð´Ð¾ за данни изтече"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "ÐеуÑпех при прехвърлÑнето на данни, Ñървърът Ñъобщи: „%s“"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Запитване"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "ÐеуÑпех при извикването на "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Свързване Ñ %s (%s)"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "ÐеуÑпех при Ñъздаването на гнездо за %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ðе може да Ñе започне Ñвързване Ñ %s:%s (%s)."
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "ÐеуÑпех при Ñвързване Ñ %s:%s (%s), допуÑтимото време изтече"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "ÐеуÑпех при Ñвързване Ñ %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Свързване Ñ %s"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "ÐеуÑпех при намирането на IP адреÑа на „%s“"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Временен неуÑпех при намирането на IP адреÑа на „%s“"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Ðещо лошо Ñе Ñлучи при намирането на IP адреÑа на „%s:%s“ (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "ÐеуÑпех при Ñвързването Ñ %s %s:"
+
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "ÐеуÑпех при намирането на IP адреÑа на „%s“"
+
+#: methods/gpgv.cc:100
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+"E: СпиÑъкът Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸ от Acquire::gpgv::Options е твърде дълъг. Завършване "
+"на работа."
+
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Вътрешна грешка: Валиден подпиÑ, но не може да Ñе провери отпечатъка на "
+"ключа?!"
+
+#: methods/gpgv.cc:209
+msgid "At least one invalid signature was encountered."
+msgstr "Ðамерен е поне един невалиден подпиÑ."
+
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " за проверка на подпиÑа (инÑталиран ли е gnupg?)"
+
+#: methods/gpgv.cc:218
+msgid "Unknown error executing gpgv"
+msgstr "ÐеизвеÑтна грешка при изпълнението на gpgv"
+
+#: methods/gpgv.cc:249
+msgid "The following signatures were invalid:\n"
+msgstr "Следните подпиÑи Ñа невалидни:\n"
+
+#: methods/gpgv.cc:256
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Следните подпиÑи не можаха да бъдат проверени, защото Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¸Ñ ÐºÐ»ÑŽÑ‡ не е "
+"наличен:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "ÐеуÑпех при отварÑнето на програмен канал за %s"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "Грешка при четене от Ð¿Ñ€Ð¾Ñ†ÐµÑ %s"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "Чакане на заглавни чаÑти"
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Получен е един ред на заглавна чаÑÑ‚ Ñ Ð½Ð°Ð´ %u Ñимвола"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "Ðевалиден ред на заглавна чаÑÑ‚"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ като отговор"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ „Content-Length“"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ „Content-Range“"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "HTTP Ñървърът нÑма поддръжка за прехвърлÑне на фрагменти на файлове"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "ÐеизвеÑтен формат на дата"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "ÐеуÑпех на избора"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "ДопуÑтимото време за Ñвързване изтече"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "Грешка при запиÑа на изходен файл"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "Грешка при запиÑа на файл"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "Грешка при запиÑа на файла"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Грешка при четене от Ñървъра. ОтдалечениÑÑ‚ Ñървър прекъÑна връзката"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "Грешка при четене от Ñървъра"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "Ðевалидни данни на заглавната чаÑÑ‚"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "ÐеуÑпех при Ñвързването"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "Вътрешна грешка"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "Ðевъзможно е да Ñе прехвърли в паметта празен файл"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "ÐеуÑпех при прехвърлÑнето в паметта на %lu байта"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "ÐеизвеÑтен тип на абревиатура: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "ОтварÑне на конфигурационен файл %s"
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "Ред %d е твърде дълъг (макÑимум %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтактична грешка %s:%u: Ð’ началото на блока нÑма име."
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтактична грешка %s:%u: Излишни Ñимволи Ñлед ÑтойноÑтта"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Синтактична грешка %s:%u: Директиви могат да Ñе задават Ñамо в най-горното "
+"ниво"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтактична грешка %s:%u: Ðеподдържана директива „%s“"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтактична грешка %s:%u: Излишни Ñимволи в ÐºÑ€Ð°Ñ Ð½Ð° файла"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Грешка!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Готово"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ÐеизвеÑтна Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° команден ред „%c“ [от %s]."
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "ОпциÑта за команден ред %s не е разпозната"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "ОпциÑта за команден ред %s не е булева"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "ÐžÐ¿Ñ†Ð¸Ñ %s изиÑква аргумент."
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ÐžÐ¿Ñ†Ð¸Ñ %s: Значението Ñ‚Ñ€Ñбва да има =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ÐžÐ¿Ñ†Ð¸Ñ %s изиÑква аргумент цÑло чиÑло, не „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "ÐžÐ¿Ñ†Ð¸Ñ â€ž%s“ е твърде дълга"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "СмиÑълът %s не е ÑÑен, опитайте true или false."
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ðевалидна Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "ÐеуÑпех при намирането на атрибутите на точка за монтиране %s"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "ÐеуÑпех при преминаването в %s"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "ÐеуÑпех при намирането на атрибутите на cdrom"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Ðе Ñе използва заключване за файл за заключване %s, който е Ñамо за четене"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ÐеуÑпех при отварÑнето на файл за заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Ðе Ñе използва заключване за файл за заключване %s, който е монтиран по NFS"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "ÐеуÑпех при доÑтъпа до заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Изчака Ñе завършването на %s, но той не беше пуÑнат"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Ðарушение на защитата на паметта (segmentation fault) в подпроцеÑа %s."
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "ПодпроцеÑÑŠÑ‚ %s върна код за грешка (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "ПодпроцеÑÑŠÑ‚ %s завърши неочаквано"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "ÐеуÑпех при отварÑнето на файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr ""
+"грешка при четене, вÑе още има %lu за четене, но нÑма нито един оÑтанал"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "грешка при запиÑ, вÑе още име %lu за запиÑ, но не уÑпÑ"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "Проблем при затварÑнето на файла"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "Проблем при премахването на връзка към файла"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "Проблем при Ñинхронизиране на файла"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "Празен кеш на пакети"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "Файлът за кеш на пакети е повреден"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "Файлът за кеш на пакети е неÑъвмеÑтима верÑиÑ"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Тази верÑÐ¸Ñ Ð½Ð° APT не поддържа ÑиÑтема за верÑии „%s“"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "Кешът на пакети е бил направен за различна архитектура"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "ЗавиÑи от"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "Предварително завиÑи от"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "Предлага Ñе"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "Препоръчва Ñе"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "Конфликтира Ñ"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "ЗаменÑ"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "Изважда от употреба"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "важен"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "изиÑкван"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "Ñтандартен"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "незадължителен"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "допълнителен"
+
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото ÑÑŠÑ Ð·Ð°Ð²Ð¸ÑимоÑти"
+
+#: apt-pkg/depcache.cc:102
+msgid "Candidate versions"
+msgstr "ВерÑии кандидати"
+
+#: apt-pkg/depcache.cc:131
+msgid "Dependency generation"
+msgstr "Генериране на завиÑимоÑти"
+
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "СмеÑване на наличната информациÑ"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "ÐеуÑпех при отварÑнето на %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "ÐеуÑпех при анализирането на пакетен файл %s (1)"
+
+#: apt-pkg/tagfile.cc:186
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "ÐеуÑпех при анализирането на пакетен файл %s (2)"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Лошо форматиран ред %lu в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (адреÑ-URI)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Лошо форматиран ред %lu в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (диÑтрибуциÑ)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (анализ на адреÑ-URI)"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Лошо форматиран ред %lu в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (неограничена диÑтрибуциÑ)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Лошо форматиран ред %lu в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (анализ на диÑтрибуциÑ)"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "ОтварÑне на %s"
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s е твърде дълъг."
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (тип)"
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Типът „%s“ на ред %u в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s е неизвеÑтен."
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr ""
+"Лошо форматиран ред %u в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (идентификатор на "
+"производител)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Ð’ ÑледÑтвие на циклични завиÑимоÑти от типа „Конфликтира/Предварително "
+"завиÑи от“, за да Ñе продължи инÑталациÑта Ñ‚Ñ€Ñбва да Ñе премахне Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¸Ñ "
+"пакет %s. Това чеÑто е лошо, но ако наиÑтина иÑкате да го направите, "
+"активирайте опциÑта APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ðе Ñе поддържа индекÑен файл от типа „%s“"
+
+#: apt-pkg/algorithms.cc:245
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакетът %s Ñ‚Ñ€Ñбва да бъде преинÑталиран, но не може да Ñе намери архив за "
+"него."
+
+#: apt-pkg/algorithms.cc:1075
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
+"причинено от задържани пакети."
+
+#: apt-pkg/algorithms.cc:1077
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"ÐеуÑпех при коригирането на проблемите, имате задържани Ñчупени пакети."
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "ДиректориÑта ÑÑŠÑ ÑпиÑъци %spartial липÑва."
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "ДиректориÑта за архиви %spartial липÑва."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ИзтеглÑне на файл %li от %li (оÑтават %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Четене на ÑпиÑъка на файловете"
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ÐеуÑпех при намирането на драйвер за метод %s."
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не Ñтартира правилно"
+
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диÑка, озаглавен „%s“ в уÑтройÑтво „%s“ и натиÑнете „Enter“."
+
+#: apt-pkg/init.cc:122
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Пакетната ÑиÑтема „%s“ не е поддържана"
+
+#: apt-pkg/init.cc:138
+msgid "Unable to determine a suitable packaging system type"
+msgstr "ÐеуÑпех при определÑнето на подходÑща пакетна ÑиÑтема"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "ÐеуÑпех при получаването на атрибути на %s."
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "ТрÑбва да добавите адреÑи-URI от тип „source“ в sources.list"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"СпиÑъците Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸ или файлът за ÑÑŠÑтоÑние не можаха да бъдат анализирани "
+"или отворени."
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Може да иÑкате да изпълните „apt-get update“, за да коригирате тези проблеми"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "Ðевалиден Ð·Ð°Ð¿Ð¸Ñ Ð²ÑŠÐ² файла Ñ Ð½Ð°Ñтройки, нÑма заглавна чаÑÑ‚ Package"
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "ÐеизвеÑтен тип за отбиване %s"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "ÐÑма указан приоритет (или е нула) на отбиването"
+
+#: apt-pkg/pkgcachegen.cc:76
+msgid "Cache has an incompatible versioning system"
+msgstr "Кешът има неÑъвмеÑтима ÑиÑтема за верÑии"
+
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Възникна грешка при обработката на %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Възникна грешка при обработката на %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Възникна грешка при обработката на %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Възникна грешка при обработката на %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Възникна грешка при обработката на %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Възникна грешка при обработката на %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:209
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте Ð±Ñ€Ð¾Ñ Ð¸Ð¼ÐµÐ½Ð° на пакети, на който е ÑпоÑобна тази верÑÐ¸Ñ Ð½Ð° "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:212
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте Ð±Ñ€Ð¾Ñ Ð²ÐµÑ€Ñии, на който е ÑпоÑобна тази верÑÐ¸Ñ Ð½Ð° APT."
+
+#: apt-pkg/pkgcachegen.cc:215
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте Ð±Ñ€Ð¾Ñ Ð·Ð°Ð²Ð¸ÑимоÑти, на който е ÑпоÑобна тази верÑÐ¸Ñ Ð½Ð° APT."
+
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Възникна грешка при обработката на %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:262
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла ÑÑŠÑ Ð·Ð°Ð²Ð¸ÑимоÑти"
+
+#: apt-pkg/pkgcachegen.cc:577
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"ÐеуÑпех при получаването на атрибути на ÑпиÑъка Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸ Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код %s"
+
+#: apt-pkg/pkgcachegen.cc:662
+msgid "Collecting File Provides"
+msgstr "Събиране на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° „ОÑигурÑва“"
+
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "преименуването Ñе провали, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
+msgid "MD5Sum mismatch"
+msgstr "ÐеÑъответÑтвие на контролна Ñума MD5"
+
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "ÐÑма налични публични ключове за Ñледните идентификатори на ключове:\n"
+
+#: apt-pkg/acquire-item.cc:759
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"ÐеуÑпех при намирането на файл за пакет %s. Това може да означава, че Ñ‚Ñ€Ñбва "
+"ръчно да оправите този пакет (поради пропуÑната архитектура)."
+
+#: apt-pkg/acquire-item.cc:818
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"ÐеуÑпех при намирането на файл за пакет %s. Това може да означава, че Ñ‚Ñ€Ñбва "
+"ръчно да оправите този пакет."
+
+#: apt-pkg/acquire-item.cc:854
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"ИндекÑните файлове на пакета Ñа повредени. ÐÑма поле Filename: за пакет %s."
+
+#: apt-pkg/acquire-item.cc:941
+msgid "Size mismatch"
+msgstr "ÐеÑъответÑтвие на размера"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блокът на Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ %s не Ñъдържа отпечатък"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Използване на точка за монтиране на CD-ROM %s\n"
+"Монтиране на CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "Идентифициране..."
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "Запазен етикет: %s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Използване на точка за монтиране на CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "Демонтиране на CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "Чакане за диÑк...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "Монтиране на CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "Сканиране на диÑка за индекÑни файлове...\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+"Ðамерени Ñа %i индекÑа на пакети, %i индекÑа на пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код и %i "
+"подпиÑа.\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "Това не е валидно име, опитайте отново.\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Ðаименование на този диÑк: \n"
+"„%s“\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "Копиране на ÑпиÑъците Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "Запазване на Ð½Ð¾Ð²Ð¸Ñ ÑпиÑък Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "ЗапиÑите в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ за този диÑк Ñа:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "Демонтиране на CD-ROM..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "ЗапиÑани Ñа %i запиÑа.\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "ЗапиÑани Ñа %i запиÑа Ñ %i липÑващи файла.\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "ЗапиÑани Ñа %i запиÑа Ñ %i неÑъответÑтващи файла\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "ЗапиÑани Ñа %i запиÑа Ñ %i липÑващи и %i неÑъответÑтващи файла\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "ПодготвÑне на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "Разпакетиране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "ПодготвÑне на %s за конфигуриране"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "Конфигуриране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "%s е инÑталиран"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "ПодготвÑне за премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "Премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "%s е премахнат"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "ПодготвÑне на %s за конфигуриране"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "ÐеуÑпех при премахването на %s"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Връзката прекъÑна преждевременно"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Датата на файла %s е променена"
+
+#~ msgid "Reading file list"
+#~ msgstr "Четене на ÑпиÑъка Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ"
+
+#~ msgid "Could not execute "
+#~ msgstr "ÐеуÑпех при изпълнението на "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "ПодготвÑне на %s за премахване Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ‚Ðµ файлове"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s е премахнат Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ‚Ðµ файлове"
diff --git a/po/bs.po b/po/bs.po
index 0ac3c04b8..e26b6677b 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: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+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"
@@ -145,14 +145,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -191,6 +191,18 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenti nisu u parovima"
@@ -242,7 +254,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -327,115 +339,126 @@ msgstr ""
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je stara, pokušavam nadogradnju %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, fuzzy, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Datum datoteke je promijenjen %s"
+msgid "Failed to stat %s"
+msgstr ""
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiva nema kontrolnog zapisa"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Ne mogu otvoriti %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr ""
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -531,223 +554,223 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ili"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Ispravljam zavisnosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ne mogu ispraviti zavisnosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Urađeno"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, uradi kako kažem!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -755,75 +778,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Odustani."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Odustajem od instalacije."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Instalirano]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -831,79 +854,97 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1444
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -911,158 +952,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "PreporuÄeni paketi:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "RaÄunam nadogradnju..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1190,19 +1232,19 @@ msgstr "Sastavljam dostupne informacije"
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Ne mogu izvršiti gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Oštećena arhiva"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -1263,7 +1305,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1316,7 +1358,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu Äitati %s"
@@ -1346,9 +1389,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "ÄŒitam spiskove paketa"
@@ -1362,7 +1405,7 @@ msgstr ""
msgid "Internal error getting a package name"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "ÄŒitam spisak datoteke"
@@ -1406,10 +1449,6 @@ msgstr ""
msgid "The pkg cache must be initialized first"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1482,12 +1521,12 @@ msgstr "Datoteka nije pronađena"
msgid "File not found"
msgstr "Datoteka nije pronađena"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr ""
@@ -1614,7 +1653,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1637,7 +1676,7 @@ msgstr ""
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr ""
@@ -1666,70 +1705,71 @@ msgstr ""
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se sa %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1745,76 +1785,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "ÄŒekam na zaglavlja"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1827,7 +1867,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1948,7 +1988,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2094,74 +2134,89 @@ msgstr "opcionalno"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Gradim stablo zavisnosti"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Verzije kandidata"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Stvaranje zavisnosti"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2179,19 +2234,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2205,11 +2260,18 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "ÄŒitam spisak datoteke"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2220,17 +2282,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2264,82 +2326,82 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr ""
@@ -2348,31 +2410,35 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr ""
@@ -2515,14 +2581,17 @@ msgstr "PreporuÄuje"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Datum datoteke je promijenjen %s"
diff --git a/po/ca.po b/po/ca.po
index 279615414..a8d529182 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,15 +1,15 @@
# Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006 Software in the Public Interest, Inc.
# Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
# Matt Bonner <mateubonet@yahoo.com>, 2003.
-# Jordi Mallach <jordi@debian.org>, 2004, 2005.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-07-19 01:31+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -148,14 +148,14 @@ msgstr " Taula de versió:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per a %s %s compilat el %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -199,7 +199,7 @@ msgstr ""
" apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n"
"\n"
"apt-cache és una eina usada per a manipular fitxers binaris en\n"
-"el cau de APT, i així poder consultar-ne la informació\n"
+"el cau d'APT, i així poder consultar-ne la informació\n"
"\n"
"Ordres:\n"
" add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n"
@@ -230,6 +230,18 @@ msgstr ""
"Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més "
"informació.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 2.1r1 Disc 1»"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Inseriu un disc en la unitat i premeu Intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Els arguments no són en parells"
@@ -291,7 +303,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -414,115 +426,126 @@ msgstr "No s'ha trobat cap selecció"
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:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "La BD és vella, s'està intentant actualitzar %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "No es pot obrir el fitxer de DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "La data del fitxer ha canviat %s"
+msgid "Failed to stat %s"
+msgstr "No es pot determinar l'estat de %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arxiu sense registre de control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No es pot llegir el directori %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No es pot veure l'estat %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Els errors s'apliquen al fitxer "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "No s'ha pogut resoldre %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "L'arbre està fallant"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "No s'ha pogut obrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "No s'ha pogut llegir l'enllaç %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "No s'ha pogut alliberar %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No s'ha pogut enllaçar %s a %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "No es pot determinar l'estat de %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s no té una entrada dominant\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s no té una entrada dominant\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -618,79 +641,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "però està instal·lat %s"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "però no és instal·lable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "però no està instal·lat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "però no serà instal·lat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "S'instal·laran els següents paquets NOUS:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "S'ELIMINARAN els següents paquets:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els següents paquets:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els següents paquets:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els següents paquets:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Es canviaran els següents paquets mantinguts:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -698,146 +721,146 @@ msgstr ""
"AVÃS: Els següents paquets essencials seran eliminats.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instal·lar, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstal·lats, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a eliminar i %lu no actualitzats.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instal·lats o eliminats completament.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "S'estan corregint les dependències..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " ha fallat."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "No es poden corregir les dependències"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "No es pot minimitzar el joc de versions revisades"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fet"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependències sense satisfer. Proveu-ho usant -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVÃS: No es poden autenticar els següents paquets!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "No s'ha pogut autenticar alguns paquets"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Hi ha problemes i s'ha usat -y sense --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
"trencats!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es necessita obtenir %sB d'arxius.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, 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:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +871,28 @@ msgstr ""
"Per a continuar escriviu la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avortat."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,48 +900,48 @@ msgstr ""
"No es poden descarregar alguns arxius, potser executant apt-get update o "
"intenteu-ho amb --fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "S'està avortant la instal·lació."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquet %s és un paquet virtual proveït per:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instal·lat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -929,50 +952,50 @@ msgstr ""
"en fa referència. Això normalment vol dir que el paquet falta,\n"
"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Tot i que els següents paquets el reemplacen:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquet %s no té candidat d'instal·lació"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ja es troba en la versió més recent.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -980,25 +1003,45 @@ msgstr ""
"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc "
"s'han usat els antics."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1049,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1018,7 +1061,7 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1028,119 +1071,120 @@ msgstr ""
"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
"un informe d'error en contra d'aquest per a arxivar-lo."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
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:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1149,7 +1193,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1158,32 +1202,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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 instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1297,9 +1341,9 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+"El medi ha canviat: inseriu el disc amb l'etiqueta\n"
+" «%s»\n"
+"en la unitat «%s» i premeu Intro\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1368,19 +1412,19 @@ msgstr "S'està fusionant la informació disponible"
msgid "Failed to create pipes"
msgstr "No es poden crear els conductes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "No es pot executar el gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
@@ -1441,7 +1485,7 @@ msgstr "Fitxer de conf. duplicat %s/%s"
msgid "Failed to write file %s"
msgstr "No s'ha pogut escriure el fitxer %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ha fallat el tancament del fitxer %s"
@@ -1494,7 +1538,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1526,9 +1571,9 @@ msgstr ""
"fitxers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "S'està llegint la llista de paquets"
@@ -1542,7 +1587,7 @@ msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo"
msgid "Internal error getting a package name"
msgstr "S'ha produït un error intern en obtenir un nom de paquet"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "S'està llegint el llistat de fitxers"
@@ -1589,10 +1634,6 @@ msgstr "S'ha produït un error intern en afegir una desviació"
msgid "The pkg cache must be initialized first"
msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "S'està llegint la llista de fitxers"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1658,20 +1699,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fitxer no trobat"
+msgstr "No s'ha trobat el disc"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fitxer no trobat"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -1800,7 +1840,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1823,7 +1863,7 @@ msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "No es pot invocar"
@@ -1852,73 +1892,74 @@ msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No s'ha pogut connectar amb %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "S'està connectant amb %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "No s'ha pogut resoldre '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "S'ha produït un error temporal en resoldre '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "No es pot connectar amb %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "No s'ha pogut resoldre '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
"sortint."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error intern: La signatura és correcta, però no s'ha pogut determinar "
"l'emprempta digital de la clau!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "No s'ha pogut executar "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr " per a verificar la signatura (està instal·lat el gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "S'ha produït un error desconegut en executar el gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Les següents signatures són invàlides:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1936,76 +1977,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
msgid "Read error from %s process"
msgstr "Error llegint des del procés %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Error intern"
@@ -2018,7 +2059,7 @@ msgstr "No es pot transferir un fitxer buit a memòria"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2061,7 +2102,7 @@ msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include aniuats"
+msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
@@ -2139,7 +2180,7 @@ msgstr "Operació no vàlida %s"
msgid "Unable to stat the mount point %s"
msgstr "No es pot obtenir informació del punt de muntatge %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "No es pot canviar a %s"
@@ -2284,74 +2325,89 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "S'està construint l'arbre de dependències"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versions candidates"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Dependències que genera"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "S'està fusionant la informació disponible"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "No es pot analitzar el fitxer del paquet %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
@@ -2373,14 +2429,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "El tipus de fitxer índex '%s', no està suportat"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2388,7 +2444,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets mantinguts."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets mantinguts que estan "
@@ -2404,10 +2460,17 @@ msgstr "Falta el directori de llistes %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta el directori d'arxiu %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "S'està baixant el fitxer %li de %li (falten %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "S'està llegint el llistat de fitxers"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2419,20 +2482,17 @@ msgstr "No s'ha pogut trobar el mètode de control %s."
msgid "Method %s did not start correctly"
msgstr "El mètode %s no s'ha iniciat correctament"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetament '%s' no està suportat."
+msgstr "El sistema d'empaquetament '%s' no està suportat"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2468,86 +2528,86 @@ msgstr "No s'ha entès el pin de tipus %s"
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La memòria cau té un sistema de versions incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de dependències de les que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
"S'ha produït un error durant el processament de %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
@@ -2556,11 +2616,15 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2570,16 +2634,16 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
-"significar que haureu d'arreglar aquest paquet manualment."
+"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
+"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2587,9 +2651,9 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
-msgstr "Mida diferent"
+msgstr "La mida no concorda"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2693,59 +2757,74 @@ msgstr ""
"coincidents\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està preparant %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "S'està obrint %s"
+msgstr "S'està desempaquetant %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "S'està obrint el fitxer de configuració %s"
+msgstr "S'està preparant per a configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "S'està connectant amb %s"
+msgstr "S'està configurant %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instal·lat: "
+msgstr "S'ha instal·lat %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "S'està preparant per a l'eliminació de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està eliminant %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomana"
+msgstr "S'ha eliminat %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "S'està preparant per a configurar %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "No es pot eliminar %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La connexió s'ha tancat prematurament"
+#~ msgid "File date has changed %s"
+#~ msgstr "La data del fitxer ha canviat %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "S'està llegint la llista de fitxers"
+
+#~ msgid "Could not execute "
+#~ msgstr "No s'ha pogut executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "S'està preparant per a eliminar amb la configuració %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "S'ha eliminat amb la configuració %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s"
diff --git a/po/cs.po b/po/cs.po
index 57084ffca..e4ca6486c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,15 +1,15 @@
# Czech translation of APT
# This file is put in the public domain.
-# Miroslav Kure <kurem@debian.cz>, 2004.
+# Miroslav Kure <kurem@debian.cz>, 2004-2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-11 16:14+0100\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-14 18:36+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <provoz@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,7 @@ msgstr " Kandidát: "
#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
-msgstr " Vypíchnutý balík:"
+msgstr " Vypíchnutý balík: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
@@ -145,14 +145,14 @@ msgstr " Tabulka verzí:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pro %s %s zkompilován na %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -226,6 +226,18 @@ msgstr ""
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
"Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Tento proces opakujte pro všechna zbývající média."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenty nejsou v párech"
@@ -286,7 +298,7 @@ msgstr ""
" -c=? NaÄte tento konfiguraÄní soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nemohu zapsat do %s"
@@ -320,7 +332,6 @@ msgid "Error processing contents %s"
msgstr "Chyba při zpracovávání obsahu %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -369,11 +380,11 @@ msgstr ""
" generate konfiguraÄnísoubor [skupiny]\n"
" clean konfiguraÄnísoubor\n"
"\n"
-"apt-ftparchive generuje indexové soubory debianích archívů. Podporuje\n"
+"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n"
"nÄ›kolik režimů vytváření - od plnÄ› automatického až po funkÄní ekvivalent\n"
"příkazů dpkg-scanpackages a dpkg-scansources.\n"
"\n"
-"apt-ftparchive ze stromu .deb souborů vygeneruje soubory Packages. Soubor\n"
+"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n"
"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n"
"velikost a MD5 souÄet. Podporován je také soubor override, kterým můžete \n"
"vynutit hodnoty polí Priority a Section.\n"
@@ -409,115 +420,126 @@ msgstr "Žádný výběr nevyhověl"
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:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je stará, zkouším aktualizovat %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nemohu otevřít DB soubor %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Datum souboru se změnil %s"
+msgid "Failed to stat %s"
+msgstr "Nemohu vyhodnotit %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr "Archív nemá kontrolní záznam"
+msgstr "Archiv nemá kontrolní záznam"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nemohu získat kurzor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nemohu Äíst adresář %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nemohu vyhodnotit %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Chyby se týkají souboru "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba při zjišťování %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Průchod stromem selhal"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Nelze otevřít %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkování %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Nemohu pÅ™eÄíst link %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Nemohu odlinkovat %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nezdařilo se slinkovat %s s %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nemohu vyhodnotit %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
-msgstr "Archív nemá pole Package"
+msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nemá žádnou položku pro override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nemá žádnou položku pro override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -613,80 +635,79 @@ msgstr "Problém s odlinkováním %s"
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " nebo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÃNY:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -694,224 +715,224 @@ msgstr ""
"VAROVÃNÃ: Následující nezbytné balíky budou odstranÄ›ny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstranÄ›no pouze ÄásteÄnÄ›.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Opravuji závislosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " selhalo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nemohu opravit závislosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nemohu minimalizovat sadu pro aktualizaci"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Pro opravení můžete spustit `apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplněné závislosti. Zkuste použít -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROVÃNÃ: Následující balíky nemohou být autentizovány!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "AutentizaÄní varování potlaÄeno.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalovat tyto balíky bez ověření [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Některé balíky nemohly být autentizovány"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Vnitřní chyba při přidávání diverze"
+msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze pÅ™eÄíst seznam zdrojů."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Potřebuji stáhnout %sB/%sB archívů.\n"
+msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "Potřebuji stáhnout %sB archívů.\n"
+msgstr "Potřebuji stáhnout %sB archivů.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Na %s nemáte dostatek volného místa"
+msgstr "Nemohu urÄit volné místo v %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "Na %s nemáte dostatek volného místa."
+msgstr "V %s nemáte dostatek volného místa."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Chystáte se vykonat něco potenciálně škodlivého\n"
+"Chystáte se vykonat něco potenciálně škodlivého.\n"
"Pro pokraÄování opiÅ¡te frázi '%s'\n"
-" ?]"
+" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Přerušeno."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokraÄovat [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Stahování dokonÄeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Nemohu stáhnout některé archívy. Možná spusťte apt-get update nebo zkuste --"
+"Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
"fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nemohu opravit chybějící balíky."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Přerušuji instalaci."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Pozn: Vybírám %s místo %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuální balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Instalovaný]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Měli byste explicitně vybrat jeden k instalaci."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -922,49 +943,49 @@ msgstr ""
"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
"pouze z jiného zdroje\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Nicméně následující balíky jej nahrazují:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta pro instalaci"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je již nejnovější verze.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání '%s' pro '%s' nebylo nalezeno"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze '%s' pro '%s' nebyla nalezena"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -972,33 +993,52 @@ msgstr ""
"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
"použity starší verze."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo "
+"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1009,7 +1049,7 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1019,124 +1059,124 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "Následujcící extra balíky budou instalovány:"
+msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "DoporuÄované balíky:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr "PropoÄítávám aktualizaci..."
+msgstr "PropoÄítávám aktualizaci... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
+msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Přeskakuji dříve stažený soubor '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n"
+msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n"
+msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
-msgstr "Stažení některých archívů selhalo."
+msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Zkontrolujte, zda je nainstalován balíÄek 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1145,31 +1185,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1222,23 +1262,23 @@ msgstr ""
" upgrade - Provede aktualizaci\n"
" install - Instaluje nové balíky (balík je libc6, ne libc6.deb)\n"
" remove - Odstraní balíky\n"
-" source - Stáhne zdrojové archívy\n"
-" build-dep - Configure build-dependencies for source packages\n"
+" source - Stáhne zdrojové archivy\n"
+" build-dep - Pro zdrojové balíky nastaví build-dependencies\n"
" dist-upgrade - Aktualizace distribuce, viz apt-get(8)\n"
" dselect-upgrade - Řídí se podle výběru v dselectu\n"
-" clean - Smaže stažené archívy\n"
-" autoclean - Smaže staré stažené archívy\n"
+" clean - Smaže stažené archivy\n"
+" autoclean - Smaže staré stažené archivy\n"
" check - Ověří, zda se nevyskytují poškozené závislosti\n"
"\n"
"Volby:\n"
" -h Tato nápověda\n"
" -q Nezobrazí indikátor postupu - pro záznam\n"
" -qq Nezobrazí nic než chyby\n"
-" -d Pouze stáhne - neinstaluje ani nerozbaluje archívy\n"
+" -d Pouze stáhne - neinstaluje ani nerozbaluje archivy\n"
" -s Pouze simuluje prováděné akce\n"
" -y Na všechny otázky odpovídá Ano\n"
" -f Zkusí pokraÄovat, i když selže kontrola integrity\n"
-" -m Zkusí pokraÄovat, i když se nepodaří najít archívy\n"
+" -m Zkusí pokraÄovat, i když se nepodaří najít archivy\n"
" -u Zobrazí také seznam aktualizovaných balíků\n"
" -b Po stažení zdrojového balíku jej i zkompiluje\n"
" -V Zobrazí Äísla verzí\n"
@@ -1258,11 +1298,11 @@ msgstr "Mám:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "Ign"
+msgstr "Ign "
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr "Err"
+msgstr "Err "
#: cmdline/acqprogress.cc:135
#, c-format
@@ -1272,7 +1312,7 @@ msgstr "Staženo %sB za %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr "[Pracuji]"
+msgstr " [Pracuji]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1347,42 +1387,42 @@ msgstr "SluÄuji dostupné informace"
msgid "Failed to create pipes"
msgstr "Selhalo vytvoření roury"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Selhalo spuštění gzipu "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
-msgstr "Porušený archív"
+msgstr "Porušený archiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolní souÄet taru selhal, archív je poÅ¡kozený"
+msgstr "Kontrolní souÄet taru selhal, archiv je poÅ¡kozený"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznámá hlaviÄka TARu typ %u, Älen %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr "Neplatný podpis archívu"
+msgstr "Neplatný podpis archivu"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr "Chyba pÅ™i Ätení záhlaví prvku archívu"
+msgstr "Chyba pÅ™i Ätení záhlaví prvku archivu"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "Neplatné záhlaví prvku archívu"
+msgstr "Neplatné záhlaví prvku archivu"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
-msgstr "Archív je příliš krátký"
+msgstr "Archiv je příliš krátký"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "Chyba pÅ™i Ätení hlaviÄek archívu"
+msgstr "Chyba pÅ™i Ätení hlaviÄek archivu"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
@@ -1416,11 +1456,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Duplicitní konfiguraÄní soubor %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Selhal zápis do souboru %s"
+msgstr "Selhal zápis souboru %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Selhalo zavření souboru %s"
@@ -1438,7 +1478,7 @@ msgstr "Rozbaluji %s vícekrát"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr "Adresář %s je divertován"
+msgstr "Adresář %s je odkloněn"
#: apt-inst/extract.cc:147
#, c-format
@@ -1473,7 +1513,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Soubor %s/%s přepisuje ten z balíku %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nemohu Äíst %s"
@@ -1503,9 +1544,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáře info a temp musí být na stejném souborovém systému"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Čtu seznamy balíků"
@@ -1519,7 +1560,7 @@ msgstr "Nepodařilo se změnit na admin adresář %sinfo"
msgid "Internal error getting a package name"
msgstr "Vnitřní chyba při získávání jména balíku"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Čtu výpis souborů"
@@ -1566,10 +1607,6 @@ msgstr "Vnitřní chyba při přidávání diverze"
msgid "The pkg cache must be initialized first"
msgstr "Cache balíků se musí nejprve inicializovat"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Čtu seznam souborů"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1588,12 +1625,12 @@ msgstr "Chyba při zpracování MD5. Offset %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Toto není platný DEB archív, chybí Äást '%s'"
+msgstr "Toto není platný DEB archiv, chybí Äást '%s'"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Toto není platný DEB archív, neobsahuje Äást '%s' ani '%s'"
+msgstr "Toto není platný DEB archiv, neobsahuje Äást '%s' ani '%s'"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1635,20 +1672,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Soubor nebyl nalezen"
+msgstr "Disk nebyl nalezen."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Soubor nebyl nalezen"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nelze nastavit Äas modifikace"
@@ -1752,7 +1788,7 @@ msgstr "Nemohu naslouchat na socketu"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr "Nemohu urÄit jmého socketu"
+msgstr "Nemohu urÄit jméno socketu"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
@@ -1776,7 +1812,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1799,7 +1835,7 @@ msgstr "Přenos dat selhal, server řekl '%s'"
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Nemohu vyvolat "
@@ -1828,75 +1864,77 @@ msgstr "Nemohu navázat spojení na %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nemohu se pÅ™ipojit k %s:%s (%s), Äas spojení vyprÅ¡el"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nemohu se připojit k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Připojuji se k %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nemohu zjistit '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "DoÄasné selhání pÅ™i zjiÅ¡Å¥ování '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Nemohu se připojit k %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nemohu pÅ™istoupit ke klíÄence: '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliÅ¡ dlouhý. KonÄím."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "VnitÅ™ní chyba: Dobrý podpis, ale nemohu zjistit otisk klíÄe?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nemohu získat zámek %s"
+msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
+"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Následujcící extra balíky budou instalovány:"
+msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
+"klíÄ:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1908,76 +1946,76 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba Ätení z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "ÄŒekám na hlaviÄky"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlaviÄky pÅ™es %u znaků"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlaviÄka"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlaviÄku odpovÄ›di"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlaviÄku Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlaviÄku Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba Ätení ze serveru. Druhá strana zavÅ™ela spojení"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba Ätení ze serveru"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -1990,7 +2028,7 @@ msgstr "Nemohu provést mmap prázdného souboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2100,7 +2138,7 @@ msgstr "Volba '%s' je příliš dlouhá"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "Nechápu význam %s, zkuste true nebo false. "
+msgstr "Nechápu význam %s, zkuste true nebo false."
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
@@ -2112,7 +2150,7 @@ msgstr "Neplatná operace %s"
msgid "Unable to stat the mount point %s"
msgstr "Nelze vyhodnotit přípojný bod %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nemohu přejít do %s"
@@ -2257,74 +2295,89 @@ msgstr "volitelný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Vytvářím strom závislostí"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidátské verze"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generování závislostí"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "SluÄuji dostupné informace"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Selhal zápis souboru %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nelze zpracovat soubor %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
@@ -2345,13 +2398,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ souboru '%s' není podporován"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archív."
+msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2359,7 +2412,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
@@ -2373,10 +2426,17 @@ msgstr "Adresář seznamů %spartial chybí."
msgid "Archive directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Stahuji soubor %li z %li (%s zbývá)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Stahuji soubor %li z %li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2388,20 +2448,17 @@ msgstr "OvladaÄ metody %s nemohl být nalezen."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nebyla spuštěna správně"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Výměna média: Vložte disk nazvaný\n"
-" '%s'\n"
-"do mechaniky '%s' a stiskněte enter\n"
+msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "BalíÄkovací systém '%s' není podporován"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno urÄit vhodný typ balíÄkovacího systému"
@@ -2436,84 +2493,84 @@ msgstr "Nerozumím vypíchnutí typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache má nekompatibilní systém správy verzí"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Při zpracování %s se objevila chyba (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Při zpracování %s se objevila chyba (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Wow, pÅ™ekroÄili jste poÄet jmen balíků, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, pÅ™ekroÄili jste poÄet verzí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Wow, pÅ™ekroÄili jste poÄet závislostí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Chyba při zpracování %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
@@ -2522,11 +2579,15 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 souÄtů"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "K následujícím ID klíÄů není dostupný veÅ™ejný klíÄ:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2535,7 +2596,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je tÅ™eba opravit ruÄnÄ› (kvůli chybÄ›jící architektuÅ™e)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2544,14 +2605,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ruÄnÄ›."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2656,55 +2717,70 @@ msgstr ""
"Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Otevírám %s"
+msgstr "Připravuji %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Otevírám %s"
+msgstr "Rozbaluji %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Otevírám konfiguraÄní soubor %s"
+msgstr "Připravuji nastavení %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Připojuji se k %s"
+msgstr "Nastavuji %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalovaná verze: "
+msgstr "Nainstalován %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Připravuji odstranění %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Otevírám %s"
+msgstr "Odstraňuji %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "DoporuÄuje"
+msgstr "Odstraněn %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Připravuji úplné odstranění %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Kompletně odstraněn %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojení bylo pÅ™edÄasnÄ› ukonÄeno"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Datum souboru se změnil %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Čtu seznam souborů"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nemohu spustit "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "PÅ™ipravuji odstranÄ›ní %s vÄetnÄ› konfiguraÄních souborů"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "OdstranÄ›n %s vÄetnÄ› konfiguraÄního souboru"
diff --git a/po/cy.po b/po/cy.po
index 03d6fe042..8a68f8613 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+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"
@@ -162,14 +162,14 @@ msgstr " Tabl Fersiynnau:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -244,6 +244,22 @@ msgstr ""
" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Nid yw ymresymiadau mewn parau"
@@ -308,7 +324,7 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
@@ -433,116 +449,127 @@ msgstr "Dim dewisiadau'n cyfateb"
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:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Dyddiad ffeil wedi newid %s"
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
+
#: ftparchive/contents.cc:317
#, fuzzy, c-format
msgid "Internal error, could not locate member %s"
@@ -639,82 +666,82 @@ msgstr "Gwall wrth datgysylltu %s"
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " neu"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -724,147 +751,147 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " wedi methu."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Wedi Gorffen"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, 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:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -875,29 +902,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -905,49 +932,49 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, fuzzy, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -959,49 +986,49 @@ msgstr ""
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1009,27 +1036,46 @@ msgstr ""
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1463
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1038,7 +1084,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1051,7 +1097,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1060,117 +1106,118 @@ msgstr ""
"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, 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:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,7 +1226,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,34 +1235,34 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1401,20 +1448,20 @@ msgstr "Yn cyfuno manylion Ar Gael"
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
#, fuzzy
msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
@@ -1477,7 +1524,7 @@ msgstr "Ffeil cyfluniad dyblyg %s/%s"
msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
@@ -1532,7 +1579,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1562,9 +1610,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
@@ -1581,7 +1629,7 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
msgid "Internal error getting a package name"
msgstr "Gwall mewnol wrth gyrchu enw pecyn"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
#, fuzzy
msgid "Reading file listing"
msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -1633,11 +1681,6 @@ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
msgid "The pkg cache must be initialized first"
msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
-#: apt-inst/deb/dpkgdb.cc:386
-#, fuzzy
-msgid "Reading file list"
-msgstr "Yn Darllen Rhestr Ffeiliau"
-
#: apt-inst/deb/dpkgdb.cc:443
#, fuzzy, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1716,12 +1759,12 @@ msgstr "Ffeil heb ei ganfod"
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1852,7 +1895,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1876,7 +1919,7 @@ msgid "Query"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
@@ -1905,71 +1948,71 @@ msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Methwyd cael y clo %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1985,82 +2028,82 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:553
+#: methods/http.cc:585
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:568
+#: methods/http.cc:600
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:570
+#: methods/http.cc:602
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:836
+#: methods/http.cc:874
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2073,7 +2116,7 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -2198,7 +2241,7 @@ msgstr "Gweithred annilys %s"
msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
@@ -2346,79 +2389,94 @@ msgstr "opsiynnol"
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
# FIXME: number?
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, fuzzy, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
@@ -2440,7 +2498,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2448,7 +2506,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2456,7 +2514,7 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
@@ -2471,11 +2529,18 @@ msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
msgid "Archive directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2486,7 +2551,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2494,12 +2559,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -2537,84 +2602,84 @@ msgstr "Methwyd daeall y math pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, fuzzy, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, fuzzy, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -2623,12 +2688,16 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
# FIXME: case
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2637,7 +2706,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2646,14 +2715,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2796,19 +2865,30 @@ msgid "Removed %s"
msgstr "Argymell"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
+#~ msgid "File date has changed %s"
+#~ msgstr "Dyddiad ffeil wedi newid %s"
+
+#, fuzzy
+#~ msgid "Reading file list"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Methwyd cael y clo %s"
+
#~ msgid "Abort? [Y/n] "
#~ msgstr "Erthylu? [I/n] "
diff --git a/po/da.po b/po/da.po
index a4800bf23..d2827b147 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,20 +2,20 @@
# translation of da.po to Danish
# Advanced Package Transfer - APT message translation catalog
# Danish messages
-# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005.
#
+# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-08-30 10:18+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-01-20 22:23+0100\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:135
@@ -151,14 +151,14 @@ msgstr " Versionstabel:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s oversat på %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -232,6 +232,18 @@ msgstr ""
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
"Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Indsæt en disk i drevet og tryk retur"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Gentag processen for resten af cd'erne i dit sæt."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Parametre ikke angivet i par"
@@ -293,7 +305,7 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -415,115 +427,126 @@ msgstr "Ingen valg passede"
msgid "Some files are missing in the package file group `%s'"
msgstr "Visse filer mangler i pakkefilgruppen '%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB var ødelagt, filen omdøbt til %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB er gammel, forsøger at opgradere %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kunne ikke åbne DB-filen %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Filens dato er ændret %s"
+msgid "Failed to stat %s"
+msgstr "Kunne ikke finde %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrolindgang"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Kunne ikke læse mappen %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kunne ikke finde finde %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Fejlene vedrører filen "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Kunne ikke omsætte navnet %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Trævandring mislykkedes"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Kunne ikke åbne %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Kunne ikke 'readlink' %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Kunne ikke frigøre %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Kunne ikke lænke %s til %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Kunne ikke finde %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s har ingen tvangs-post\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s har ingen tvangs-post\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -619,79 +642,79 @@ msgstr "Problem under aflænkning af %s"
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdøbe %s til %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uopfyldte afhængigheder:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet holdt tilbage:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -699,143 +722,143 @@ msgstr ""
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Retter afhængigheder..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislykkedes."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kunne ikke rette afhængigheder"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kunne ikke minimere opgraderingssættet"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Færdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Uopfyldte afhængigheder. Prøv med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakkers autensitet kunne ikke verificeres!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installér disse pakker uden verifikation (y/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nogle pakker kunne ikke autentificeres"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldført"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke læses."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gør som jeg siger!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -846,28 +869,28 @@ msgstr ""
"For at fortsætte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Afbryder."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsætte [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -875,49 +898,49 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
"eller prøv med --fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understøttes endnu ikke"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Afbryder installationen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Bemærk, at %s vælges fremfor %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Overspringer %s, da den allerede er installeret og opgradering er "
"deaktiveret.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installeret]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du bør eksplicit vælge en at installere."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -928,49 +951,49 @@ msgstr ""
"anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
"kun kan hentes fra andre kilder\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dog kan følgende pakker erstatte den:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er i forvejen den nyeste version.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kunne ikke låse listemappen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -978,25 +1001,44 @@ msgstr ""
"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
"bruges i stedet."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern fejl. Problemløseren ødelagde noget"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade ødelagde noget"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1004,7 +1046,7 @@ msgstr ""
"Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
"en løsning)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1015,7 +1057,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgængelige."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1024,114 +1066,115 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n"
"ikke installeres og du bør indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Følgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Foreslåede pakker:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Færdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemløseren ødelagde noget"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Overspringer allerede hentet fil '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1139,7 +1182,7 @@ msgid ""
msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1148,32 +1191,32 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1357,19 +1400,19 @@ msgstr "Sammenfletter tilgængelighedsoplysninger"
msgid "Failed to create pipes"
msgstr "Kunne ikke oprette videreførsler"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Kunne ikke udføre gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Ødelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukendt TAR-hovedtype %u, element %s"
@@ -1430,7 +1473,7 @@ msgstr "Dobbelt opsætningsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Kunne ikke skrive filen %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Kunne ikke lukke filen %s"
@@ -1483,7 +1526,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overskriver filen i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke læse %s"
@@ -1513,9 +1557,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Mapperne info og temp skal ligge i samme filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Indlæser pakkelisterne"
@@ -1529,7 +1573,7 @@ msgstr "Kunne ikke skifte til admin-mappen %sinfo"
msgid "Internal error getting a package name"
msgstr "Intern fejl under hentning af et pakkenavn"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Læser fillisten"
@@ -1576,10 +1620,6 @@ msgstr "Intern fejl under tilføjelse af omrokering"
msgid "The pkg cache must be initialized first"
msgstr "pkg-mellemlageret skal initialiseres først"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Indlæser fillisten"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1646,20 +1686,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fil blev ikke fundet"
+msgstr "Disk blev ikke fundet."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fil blev ikke fundet"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -1787,7 +1826,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1810,7 +1849,7 @@ msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
msgid "Query"
msgstr "Forespørgsel"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Kunne ikke udføre "
@@ -1839,75 +1878,77 @@ msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunne ikke forbinde til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Forbinder til %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunne ikke omsætte navnet '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Der skete noget underligt under navneomsætning af '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Kunne ikke forbinde til %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kunne ikke omsætte navnet '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Stødte på mindst én ugyldig signatur."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Kunne ikke opnå låsen %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " for at verificere signaturen (er gnupg installeret?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Ukendt fejl ved kørsel af gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Følgende yderligere pakker vil blive installeret:"
+msgstr "Følgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
+"tilgængelig:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1919,77 +1960,77 @@ msgstr "Kunne ikke åbne datarør for %s"
msgid "Read error from %s process"
msgstr "Læsefejl fra %s-process"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsudløb på forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fejl ved læsning fra server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern fejl"
@@ -2002,7 +2043,7 @@ msgstr "Kan ikke udføre mmap for en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udføre mmap for %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2123,7 +2164,7 @@ msgstr "Ugyldig handling %s"
msgid "Unable to stat the mount point %s"
msgstr "Kunne ikke finde monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunne ikke skifte til %s"
@@ -2268,74 +2309,89 @@ msgstr "frivillig"
msgid "extra"
msgstr "ekstra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Opbygger afhængighedstræ"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidatversioner"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Afhængighedsgenerering"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sammenfletter tilgængelighedsoplysninger"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive filen %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kunne ikke tolke pakkefilen %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Åbner %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
@@ -2357,14 +2413,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiler af typen '%s' understøttes ikke"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2372,7 +2428,7 @@ msgstr ""
"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
"tilbageholdte pakker."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
@@ -2387,10 +2443,17 @@ msgstr "Listemappen %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Henter fil %li ud af %li (%s tilbage)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Læser fillisten"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2402,20 +2465,17 @@ msgstr "Metodedriveren %s blev ikke fundet."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startede ikke korrekt"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Medieskift: Indsæt disken med navnet\n"
-" '%s'\n"
-"i drevet '%s' og tryk retur\n"
+msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understøttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2449,84 +2509,84 @@ msgstr "Kunne ikke forstå pin-type %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
@@ -2535,11 +2595,16 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdøbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2548,7 +2613,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2557,13 +2622,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
@@ -2667,59 +2732,74 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Åbner %s"
+msgstr "Klargør %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Åbner %s"
+msgstr "Pakker %s ud"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Åbner konfigurationsfilen %s"
+msgstr "Gør klar til at sætte %s op"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Forbinder til %s"
+msgstr "Sætter %s op"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Installeret: "
+msgstr "Installerede %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Gør klar til afinstallation af %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Åbner %s"
+msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Anbefalede"
+msgstr "Fjernede %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Gør klar til at sætte %s op"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Kunne ikke slette %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen lukkedes for hurtigt"
+#~ msgid "File date has changed %s"
+#~ msgstr "Filens dato er ændret %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Indlæser fillisten"
+
+#~ msgid "Could not execute "
+#~ msgstr "Kunne ikke køre "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Gør klar til at fjerne %s inklusive opsætning"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Fjernede %s inklusive opsætning"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Ukendt leverandør-ID '%s' på linje %u i kildelisten %s"
@@ -2809,9 +2889,6 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Kunne ikke omdøbe %s.new til %s"
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Indsæt en disk i drevet og tryk retur"
-
#~ msgid "I found (binary):"
#~ msgstr "Jeg fandt (binære programfiler):"
@@ -2829,15 +2906,9 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgstr ""
#~ "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
-
#~ msgid " '"
#~ msgstr " '"
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr "Gentag processen for resten af cd'erne i dit sæt."
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/de.po b/po/de.po
index 2327f8a44..32563174a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-06-15 18:22+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -146,14 +146,14 @@ msgstr " Versions-Tabelle:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s für %s %s kompiliert am %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,21 @@ msgstr ""
"tmp\n"
"Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
+"Disk 1«"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumente nicht paarweise"
@@ -293,7 +308,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kann nicht nach %s schreiben"
@@ -423,115 +438,126 @@ msgstr "Keine Auswahl passt"
msgid "Some files are missing in the package file group `%s'"
msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB wurde beschädigt, Datei umbenannt in %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB ist alt, versuche %s zu erneuern"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kann DB-Datei %s nicht öffnen: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Dateidatum hat sich geändert %s"
+msgid "Failed to stat %s"
+msgstr "Kann auf %s nicht zugreifen."
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archiv ist keinen Steuerungs-Datensatz"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kann keinen Cursor bekommen"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kann Verzeichnis %s nicht lesen\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kann nicht zugreifen auf %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Fehler gehören zu Datei "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Konnte %s nicht auflösen"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Baumabschreiten fehlgeschlagen"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Konnte %s nicht öffnen"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Kann kein readlink auf %s durchführen"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Konnte %s entfernen (unlink)"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Kann auf %s nicht zugreifen."
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archiv hatte kein Paket-Feld"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Maintainer ist %s und nicht %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -627,79 +653,79 @@ msgstr "Problem beim Unlinking von %s"
msgid "Failed to rename %s to %s"
msgstr "Konnte %s nicht in %s umbenennen"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " oder "
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Die folgenden gehaltenen Pakete werden verändert:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -708,147 +734,147 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr "Diese Pakete ohne Überprüfung installieren [y/N]? "
+msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Einige Pakete konnten nicht authentifiziert werden"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an "
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB Archive geholt werden.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -859,28 +885,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -888,48 +914,48 @@ msgstr ""
"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder "
"mit »--fix-missing« probieren?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Achtung, wähle %s an Stelle von %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Sie sollten eines explizit zum Installieren auswählen."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -940,51 +966,51 @@ msgstr ""
"Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -992,27 +1018,47 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1066,7 @@ msgstr ""
"Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jeglich Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1032,7 +1078,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1043,119 +1089,119 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Ãœberspringe Entpacken der schon entpackten Quelle in %s\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ãœberspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1210,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1219,32 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
"zu neu."
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1290,7 +1336,7 @@ msgstr "Hole:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "Ign "
+msgstr "Ign "
#: cmdline/acqprogress.cc:114
msgid "Err "
@@ -1386,19 +1432,19 @@ msgstr "Führe Information zur Verfügbarkeit zusammen"
msgid "Failed to create pipes"
msgstr "Konnte Weiterleitungen nicht erzeugen"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Konnte gzip nicht ausführen"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Korrumpiertes Archiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s"
@@ -1459,7 +1505,7 @@ msgstr "Doppelte Konfigurationsdatei %s/%s"
msgid "Failed to write file %s"
msgstr "Konnte nicht in Datei %s schreiben"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Konnte Datei %s nicht schließen"
@@ -1512,7 +1558,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datei %s/%s überschreibt die Datei in Paket %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kann %s nicht lesen"
@@ -1543,9 +1590,9 @@ msgstr ""
"Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Paketlisten werden gelesen"
@@ -1560,7 +1607,7 @@ msgid "Internal error getting a package name"
msgstr "Interner Fehler beim Holen des Paket-Namens"
#
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Paketlisten werden gelesen"
@@ -1607,10 +1654,6 @@ msgstr "Interner Fehler beim Hinzufügen einer Umleitung"
msgid "The pkg cache must be initialized first"
msgstr "Der Paketcache muss erst initialisiert werden"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Paketlisten werden gelesen"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1687,12 +1730,12 @@ msgid "File not found"
msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kann nicht zugreifen."
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Kann Änderungszeitpunkt nicht setzen"
@@ -1821,7 +1864,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1844,7 +1887,7 @@ msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«"
msgid "Query"
msgstr "Abfrage"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Kann nicht aufrufen: "
@@ -1874,71 +1917,71 @@ msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Konnte nicht mit %s:%s verbinden (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Verbinde mit %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Konnte »%s« nicht auflösen"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Kann nicht mit %s:%s verbinden:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Konnte »%s« nicht auflösen"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Konnte Lock %s nicht bekommen"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1954,78 +1997,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2038,7 +2081,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Konnte kein mmap von %lu Bytes durchführen"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2160,7 +2203,7 @@ msgstr "Ungültige Operation %s."
msgid "Unable to stat the mount point %s"
msgstr "Kann auf den Einhängepunkt %s nicht zugreifen."
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kann nicht nach %s wechseln"
@@ -2305,74 +2348,89 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Abhängigkeitsbaum wird aufgebaut"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Mögliche Versionen"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Abhängigkeits-Generierung"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Führe Information zur Verfügbarkeit zusammen"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Konnte %s nicht öffnen"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Konnte nicht in Datei %s schreiben"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kann Paketdatei %s nicht parsen (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kann Paketdatei %s nicht parsen (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quellliste %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
@@ -2394,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexdateityp »%s« wird nicht unterstützt"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2402,7 +2460,7 @@ msgstr ""
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2410,7 +2468,7 @@ msgstr ""
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
@@ -2424,11 +2482,19 @@ msgstr "Listenverzeichnis %spartial fehlt."
msgid "Archive directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Paketlisten werden gelesen"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2439,7 +2505,7 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
msgid "Method %s did not start correctly"
msgstr "Methode %s hat nicht korrekt gestartet"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2447,12 +2513,12 @@ msgstr ""
" »%s«\n"
"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
@@ -2491,88 +2557,88 @@ msgstr "Konnte Stecknadeltyp (»pin type«) %s nicht verstehen"
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
"kann."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT "
"handhaben kann."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Sammle Datei-Empfehlungen ein"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
@@ -2581,11 +2647,15 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2594,7 +2664,7 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2603,14 +2673,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2756,19 +2826,29 @@ msgid "Removed %s"
msgstr "Empfiehlt"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Öffne Konfigurationsdatei %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Konnte %s nicht entfernen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbindung zu früh beendet"
+#~ msgid "File date has changed %s"
+#~ msgstr "Dateidatum hat sich geändert %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Paketlisten werden gelesen"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Konnte Lock %s nicht bekommen"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s"
@@ -2861,10 +2941,6 @@ msgstr "Verbindung zu früh beendet"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Konnte %s.new nicht in %s umbenennen"
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
-
#~ msgid "I found (binary):"
#~ msgstr "Habe gefunden (binär):"
@@ -2882,18 +2958,9 @@ msgstr "Verbindung zu früh beendet"
#~ msgstr ""
#~ "Konnte keine Paket-Dateien finden - vielleicht ist dies keine Debian-CD"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr ""
-#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
-#~ "Disk 1«"
-
#~ msgid " '"
#~ msgstr " »"
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr ""
-#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/dz.po b/po/dz.po
new file mode 100644
index 000000000..313ecfb63
--- /dev/null
+++ b/po/dz.po
@@ -0,0 +1,2762 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt_po.pot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
+"PO-Revision-Date: 2006-06-20 12:50+0530\n"
+"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
+"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
+"X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: Bhutan\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ %s à½à½¼à½“་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%sà½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་à½à½¼à½–à¼"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
+
+#: cmdline/apt-cache.cc:272
+msgid " Normal packages: "
+msgstr "སྤྱིར་བà½à½„་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུà¼"
+
+#: cmdline/apt-cache.cc:273
+msgid " Pure virtual packages: "
+msgstr "བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཙང་མ་ཚུ:"
+
+#: cmdline/apt-cache.cc:274
+msgid " Single virtual packages: "
+msgstr "བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་རà¾à¾±à½„་པ་ཚུ:"
+
+#: cmdline/apt-cache.cc:275
+msgid " Mixed virtual packages: "
+msgstr "བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
+
+#: cmdline/apt-cache.cc:276
+msgid " Missing: "
+msgstr "བརླག་སྟོར་ཞུགས་པ:"
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "à½à¾±à½‘་རྟགས་ཅན་གྱི་à½à½¼à½“་རིམ་ཚུ་གི་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "རྟེན་འབྲེལ་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "à½à½ºà½“་རིམ་/ཡིག་སྣོད་ མà½à½´à½“་འབྲེལ་གྱི་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་à½à¾²à¼‹à½–ཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "རྟེན་འབྲེལ་à½à½¼à½“་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "གི་དོན་ལུ་རྩིས་à½à½¼à¼‹à½–à½à½¼à½“་ཡོད་པའི་བར་སྟོང:"
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་à½à½¢à¼‹à½¨à½²à½“་པསà¼"
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "à½à¾±à½¼à½‘་ཀྱིས་à½à½‚་à½à½‚་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་མ་à½à½¼à½–à¼"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་ཡིག་སྣོད:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་à½à½¢à¼‹à½¨à½²à½“་པས་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པསà¼"
+
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "à½à½–་གཟེར་བà½à½–་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(མ་à½à½¼à½–à¼)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid " Installed: "
+msgstr "གཞི་བཙུགས་འབད་ཡོདཔà¼"
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(ཅི་མེདà¼)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid " Candidate: "
+msgstr "མི་ངོ:"
+
+#: cmdline/apt-cache.cc:1532
+msgid " Package pin: "
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½–་གཟེར:"
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid " Version table:"
+msgstr "à½à½¼à½“་རིམ་à½à½²à½‚་à½à¾²à½˜à¼:"
+
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid " %4i %s\n"
+msgstr "%4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"ལག་ལེནà¼: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+" apt-cacheའདི་གནས་རིམ་དམའ་དྲག་གི་ལག་ཆས་ APT's binary\n"
+"་ འདྲ་མཛོད་ཡིག་སྣོད་གཡོག་བཀོལ་དོན་ལུ་ལག་ལེན་འà½à½–་ནི་དང་་དེ་ཚུ་ནང་ལས་བརྡ་དོན་འདྲི་དཔྱད་འབད་ནིའི་དོན་"
+"ལུ་ཨིནà¼\n"
+"cache files, and query information from them\n"
+"\n"
+"བརྡ་བཀོད:\n"
+" add -འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་ཅིག་འབྱུང་à½à½´à½„ས་འདྲ་མཛོད་ལུ་à½à¼‹à½¦à¾à½¼à½„་རà¾à¾±à½–ས་ཨིནà¼\n"
+" gencaches -འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དང་འབྱུང་à½à½´à½„ས་འདྲ་མཛོད་གཉིས་ཆ་རང་བཟོ་བརྩིགས་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" showpkg -འད་གིས་་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་རà¾à¾±à½„་པ་ཅིག་གི་དོན་ལུ་སྤྱིར་བà½à½„་བརྡ་དོན་དུམ་གྲ་ཅིག་སྟོནམ་ཨིནà¼\n"
+" showsrc - འདི་གིས་འབྱུང་à½à½´à½„ས་ཀྱི་དྲན་à½à½¼à¼‹à½šà½´à¼‹à½¦à¾Ÿà½¼à½“མ་ཨིནà¼\n"
+" stats -འདི་གིས་ གཞི་རིམ་ཚད་རྩིས་དུམ་གྲ་རེ་སྟོནམ་ཨིནà¼\n"
+" dump -འདི་གི་ཡིག་སྣོད་ཧྲིལ་བུ་མདོར་བསྡུས་རྣམཔ་་ཅིག་ནང་སྟོནམ་ཨིནà¼\n"
+" dumpavail -འདི་གིས་ཨེསི་ཊི་ཌི་ཕྱི་à½à½¢à¼‹à½£à½´à¼‹ འà½à½¼à½–་ཚུགས་པའི་ཡིག་སྣོད་ཚུ་དཔར་བསà¾à¾²à½´à½“་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" unmet - འདི་གིས་མ་ཚང་བའི་ རྟེན་འབྲེལ་ཚུ་སྟོནམ་ཨིནà¼\n"
+" search -འདི་གིས་ རི་ཇེགསི་དཔེ་གཞི་ཅིག་གི་དོན་ལུ་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½¼à¼‹à½¡à½²à½‚་དེ་འཚོལ་ཞིབ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" show - འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ ལྷག་བà½à½´à½–་པའི་དྲན་à½à½¼à¼‹à½…ིག་སྟོནམ་ཨིནà¼\n"
+" depends - འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ རགས་པ་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་ཅིག་ སྟོནམ་ཨིནà¼\n"
+" rdepends - འདི་གིས་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་གི་དོན་ལུ་ རིམ་ལོག་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་དེ་སྟོནམ་ཨིནà¼\n"
+" pkgnames - འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ཆ་མཉམ་གི་མིང་ཚུ་à½à½¼à¼‹à½–ཀོད་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" dotty - འདི་གིས་ཚད་à½à¾²à½˜à¼‹à½à½²à½¦à½²à¼‹à½‚ི་དོན་ལུ་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚད་à½à¾²à½˜à¼‹à½šà½´à¼‹ བཟོ་བà½à½¼à½“་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" xvcg - འདི་གིས་ ཨེགསི་à½à½²à¼‹à½¦à½²à¼‹à½‡à½²à¼‹ གི་དོན་ལུ་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚད་à½à¾²à½˜à¼‹à½šà½´à¼‹à½–ཟོ་བà½à½¼à½‘་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" policy - འདི་གིས་ སྲིད་བྱུས་སྒྲིག་སྟངས་ཚུ་སྟོནམ་ཨིནà¼\n"
+"\n"
+"གདམ་à½à¼‹à½šà½´à¼‹:\n"
+" -h འདི་གིས་ཚིག་ཡིག་ལུ་ཆ་རོགས་འབདà½à¼‹à½¨à½²à½“à¼.\n"
+" -p=? འདི་འབྱུང་à½à½´à½„ས་འའདྲ་མཛོད་ཨིནà¼.\n"
+" -s=? འདི་འབྱུང་à½à½´à½„ས་འདྲ་མཛོད་ཨིནà¼.\n"
+" -q འདི་གིས་ ཡར་འཕེལ་བརྡ་སྟོན་པ་འདི་ལྕོགས་མིན་བཟོà½à¼‹à½¨à½²à½“à¼.\n"
+" -i འདི་གིས་ མ་ཚང་པའི་བརྡ་བཀོད་ཚུ་གི་དོན་ལུ་ གལ་ཅན་གྱི་ཌེཔསི་རà¾à¾±à½„མ་ཅིག་སྟོནà¼.\n"
+" -c=? འདི་གིས་ འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིནà¼.\n"
+" -o=? འདི་གིས་ མà½à½´à½“་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་à½à¼‹à½ à½‘ི་གཞི་སྒྲིག་འབདà½à¼‹à½¨à½²à½“་ དཔེར་ན་ eg -o dir::"
+"cache=/tmp\n"
+" ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་à½à½¼à½‚་ཤོག་ལེབ་ཚུ་བལྟà¼.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་ དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམà¼"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབà¼"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "à½à¾±à½¼à½‘་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསà¾à¾±à½¢à¼‹à½ à½–དà¼"
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "སྒྲུབས་རྟགས་ཚུ་ཟུང་ནང་མིན་འདུག"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན:apt-config [གདམ་à½à¼‹à½šà½´à¼‹] བརྡ་བཀོདà¼\n"
+"\n"
+"apt-config་འདི་APT config་ཡིག་སྣོད་ལྷག་ནིའི་དོན་ལུ་འཇམ་སམ་ལག་ཆས་ཅིག་ཨིནà¼\n"
+"\n"
+"བརྡ་བཀོད་ཚུ:\n"
+" shell - ཤལ་གྱི་à½à½–ས་ལམà¼\n"
+" dump - འདི་གིས་རིམ་སྒྲིག་གི་à½à½–ས་ལམ་འདི་སྟོནམ་ཨིནà¼\n"
+"\n"
+"གདམ་à½à¼‹à½šà½´:\n"
+" -h འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིནà¼\n"
+" -o=? མà½à½´à½“་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདà½à¼‹à½¨à½²à½“་ དཔེར་ན་-o dir::cache=/tmp་བཟུམà¼\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པསà¼"
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིནà¼\n"
+"གདམ་à½à¼‹à½šà½´à¼\n"
+" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -t འདི་གིས་temp་སྣོད་à½à½¼à¼‹à½ à½‘ི་གཞི་སྒྲིག་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིནà¼\n"
+" -o=? འདི་གིས་མà½à½´à½“་སྒྲིག་རིམ་སྒྲིག་གདམ་à½à¼‹à½…ིག་གཞི་སྒྲིག་འབདà½à¼‹à½¨à½²à½“་ དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམà¼\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགསà¼"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf ་་འà½à½¼à½“་རིམ་འདི་ལེན་མ་ཚུགས༠debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་རྒྱ་བསà¾à¾±à½ºà½‘་à½à½¼à½‚་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "སྣོད་à½à½¼à¼‹%s་ལས་སྦྱོར་འབདà½à¼‹à½‘་འཛོལ་བ་འà½à½¼à½“་ཡིà¼"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "འབྱུང་à½à½´à½„ས་རྒྱ་བསà¾à¾±à½ºà½‘་ཀྱི་à½à½¼à½‚་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པསà¼"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོནà¼"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"ལག་ལེན:apt-ftparchive [options] command\n"
+"བརྡ་བཀོད་ཚུ:packages binarypath [overridefile [pathprefix]]\n"
+"sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བà½à½¼à½“་འབདà½à¼‹"
+"ཨིན༠dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་ "
+"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོà½à¼‹à¼‹à½“ང་ལས་བཟོ་བà½à½¼à½“་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲà½à¼‹à½¦à¾¦à½ºà¼‹à½¡à½¼à½‘་མི་ལུ་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½ à½–དà½à¼‹"
+"ཨིནà¼\n"
+"\n"
+"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བà½à½¼à½“་འབདà½à¼‹à½¨à½²à½“༠"
+"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་\n"
+" ཡིག་སྣོད་འདི་གི་ནང་ན་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་"
+"རྟགས༠(#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན༠ཟུར་བཞག་ཡིག་སྣོད་འདི་\n"
+"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½ à½–ད་ཡོདཔ་ཨིནà¼\n"
+"\n"
+"འདི་དང་ཆ་འདྲà½à¼‹à½¦à¾¦à½ºà¼‹ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་à½à½´à½„ས་ཡིག་སྣོད་ཚུ་"
+"བཟོ་བà½à½¼à½“་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" --source-ཟུར་བཞག་གི་གདམ་à½à¼‹à½ à½‘ི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་"
+"འà½à½–་བà½à½´à½–་ཨིནà¼\n"
+"\n"
+"'à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་'་དང་'འབྱུང་à½à½´à½„ས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན༠ཟུང་"
+"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n"
+"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན༠འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n"
+"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན༠དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་"
+"ལེན་བཟུམ:\n"
+"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"གདམ་à½à¼‹à½šà½´:\n"
+" -h འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" --md5 ཨེམ་ཌི་༥་ བཟོ་བà½à½¼à½“་འདི་ཚད་འཛིན་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -s=? འབྱུང་à½à½´à½„ས་ཟུར་བཞག་གི་ཡིག་སྣོདà¼\n"
+" -q à½à½´à¼‹à½¦à½²à½˜à¼‹à½¦à½²à½˜à¼\n"
+" -d=? གདམ་à½à¼‹à½…ན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འà½à½´à¼‹à½ à½–དà¼\n"
+" --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རà¾à¾±à½ºà½“་སེལ་à½à½–ས་ལམ་འདི་ལྕོགས་ཅན་བཟོà¼\n"
+" --contents ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བà½à½¼à½“་འདི་ཚད་འཛིན་འབདà¼\n"
+" -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
+" -o=? མà½à½´à½“་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་à½à¼‹à½…ིག་གཞི་སྒྲིག་འབདà¼"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "སེལ་འà½à½´à¼‹à½šà½´à¼‹à½˜à½à½´à½“་སྒྲིག་མིན་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
+
+#: ftparchive/cachedb.cc:45
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ཡིà¼"
+
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསà¾à¾±à½ºà½‘་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོà¼"
+
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: ftparchive/cachedb.cc:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "ཡིག་སྣོད་ཚེས་གྲངས་འདི་གིས་%sདེ་བསྒྱུར་བཅོས་འབད་ནུག"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་à½à½¼à¼‹à½˜à½²à½“་འདུག"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "འོད་རྟགས་ལེན་མ་ཚུགསà¼"
+
+#: ftparchive/writer.cc:78
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "ཌབ་ལུ:%sསྣོད་à½à½¼à¼‹à½ à½‘ི་ལྷག་མ་ཚུགསà¼\n"
+
+#: ftparchive/writer.cc:83
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགསà¼\n"
+
+#: ftparchive/writer.cc:125
+msgid "E: "
+msgstr "ཨི:"
+
+#: ftparchive/writer.cc:127
+msgid "W: "
+msgstr "ཌབ་ལུ:"
+
+#: ftparchive/writer.cc:134
+msgid "E: Errors apply to file "
+msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབདà¼"
+
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s་མོས་མà½à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འà½à½´à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:245
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s་ལས་%sལུ་འབྲེལ་འà½à½´à½‘་འབད་ནི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:274
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམསà¼\n"
+
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "ཡིག་མཛོད་ལུ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅི་ཡང་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½˜à¼‹à½–ྱུང་à¼"
+
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %sལུ་ཟུར་བཞག་à½à½¼à¼‹à½–ཀོད་མེདà¼\n"
+
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " %s ་རྒྱུན་སà¾à¾±à½¼à½„་པ་འདི་ %s ཨིན་ %s མེནà¼\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་གིས་འà½à½´à½¦à¼‹à½˜à½²à¼‹%sའདི་ག་ཡོད་འཚོལ་མ་འà½à½¼à½–à¼"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་à½à½²à½‚་%lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་à½à½²à½‚%lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་à½à½²à½‚%lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "ཡིག་སྣོད་*་ གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "à½à¼‹à½¦à¾¤à½ºà½£à¼‹à½ à½–ད་ནི་ལུ་འà½à½´à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབདà¼"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ %s་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འà½à½–་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "ཨེབ་བཤོལ་འཕྲུལ་ཆསà¼"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "ཨེམ་ཌི་༥་གློག་རིག་རà¾à¾±à½–་པའི་སà¾à½–ས་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s་འབྲེལ་འà½à½´à½‘་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལà¼"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s་ལུ་%s་བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "à½à½ à½²à¼"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
+
+#: cmdline/apt-get.cc:237
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: cmdline/apt-get.cc:327
+#, c-format
+msgid "but %s is installed"
+msgstr "འདི་འབདà½à¼‹à½‘་%s་འདི་གཞི་བཙུགས་འབད་ཡོདà¼"
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "འདི་འབདà½à¼‹à½‘་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིནà¼"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "འདི་འབདà½à¼‹à½‘་%s་འདི་གཟི་བཙུགས་འབད་མི་བà½à½´à½–་པསà¼"
+
+#: cmdline/apt-get.cc:338
+msgid "but it is a virtual package"
+msgstr "འདི་འབདà½à¼‹à½‘་ འདི་བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་ཨིན་པསà¼"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not installed"
+msgstr "འདི་འབདà½à¼‹à½‘་འདི་གཞི་བཙུགས་མ་འབད་བསà¼"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "འདི་འབདà½à¼‹à½‘་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པསà¼"
+
+#: cmdline/apt-get.cc:346
+msgid " or"
+msgstr "ཡང་ནà¼"
+
+#: cmdline/apt-get.cc:375
+msgid "The following NEW packages will be installed:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིས་གསརཔ་འདི་ཚུ་à½à½žà½²à¼‹à½–ཙུགས་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་རྩ བསà¾à¾²à½‘་གà½à½„་འོང་:"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
+
+#: cmdline/apt-get.cc:444
+msgid "The following packages will be upgraded:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་ཡར་བསà¾à¾±à½ºà½‘་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:465
+msgid "The following packages will be DOWNGRADED:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:485
+msgid "The following held packages will be changed:"
+msgstr "འོག་གི་འཆང་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:538
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s( %s་གིས་སྦེ)"
+
+#: cmdline/apt-get.cc:546
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ཉེན་བརྡ:འོག་གི་ཉོ་མà½à½¼à¼‹à½–འི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རྩ་བསà¾à¾²à½‘་གà½à½„་འོང་à¼\n"
+"à½à¾±à½¼à½‘་ཀྱིས་à½à¾±à½¼à½‘་རང་ག་ཅི་འབདà½à¼‹à½¨à½²à½“་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་à¼!"
+
+#: cmdline/apt-get.cc:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu་ཡར་བསà¾à¾±à½ºà½‘་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོདà¼"
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོདà¼"
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོདà¼"
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "རྩ་བསà¾à¾²à½‘་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསà¾à¾±à½ºà½‘་མ་འབད་བསà¼\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསà¾à¾²à½‘་མ་གà½à½„་པསà¼\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོà¼"
+
+#: cmdline/apt-get.cc:652
+msgid " failed."
+msgstr "འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: cmdline/apt-get.cc:655
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:658
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསà¾à¾±à½ºà½‘་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:660
+msgid " Done"
+msgstr "འབད་ཚར་ཡིà¼"
+
+#: cmdline/apt-get.cc:664
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་à½à¾±à½¼à½‘་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་à¼"
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ༠-f ལག་ལེན་འà½à½–་སྟེ་འབད་རྩོལ་བསà¾à¾±à½ºà½‘à¼"
+
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ཉེན་བརྡ:འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བà½à½´à½–་པསà¼"
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོདà¼\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? "
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགསà¼"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདà½à½¼à½‚་ལས་ལག་ལེན་འà½à½–་སྟེ་ཡོདà¼"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+"ནང་འà½à½¼à½‘་ཀྱི་འཛོལ་བ་ གཞི་བཙུགས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་དང་གཅིག་à½à½¢à¼‹à½–ོད་བརྡ་འབད་འདི་"
+"ཡོད!"
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རྩ་བསà¾à¾²à½‘་བà½à½„་དགོཔ་འདུག་འདི་འབདགà½à¼‹à½‘་རྩ་བསà¾à¾²à½‘་གà½à½„་ནི་འདི་ལྕོགས་མིན་à½à½£à¼‹à½à½ºà¼‹à½ à½‘ུག"
+
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བསà¼"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+msgid "Unable to lock the download directory"
+msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རà¾à¾±à½–ས་མ་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "འབྱུང་à½à½´à½„ས་ཚུ་ཀྱི་à½à½¼à¼‹à½¡à½²à½‚་དེ་ལྷག་མི་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མà½à½´à½“་སྒྲིག་མི་འབད་"
+"བསà¼"
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས༠ཡིག་མཛོད་ཚི་གི་%sB་\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པསà¼\n"
+
+#: cmdline/apt-get.cc:829
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "à½à¼‹à½¦à¾à½¼à½„་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འà½à½–་འོང་à¼\n"
+
+#: cmdline/apt-get.cc:832
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལà½à¼‹à½¦à¾¦à½ºà¼‹à½£à½´à½¦à¼‹à½ à½¼à½„་à¼\n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "%s་ནང་བར་སྟོང་"
+
+#: cmdline/apt-get.cc:849
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s ནང་à½à¾±à½¼à½‘་ལུ་བར་སྟོང་དལà½à¼‹à½£à½„མ་སྦེ་མིན་འདུག"
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "གལ་ཆུང་རà¾à¾±à½„མ་ཅིག་à½à½¦à½£à¼‹à½–ཀོད་འབད་ནུག་ འདི་འབདà½à¼‹à½‘་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེནà¼"
+
+#: cmdline/apt-get.cc:866
+msgid "Yes, do as I say!"
+msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
+
+#: cmdline/apt-get.cc:868
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"à½à¾±à½¼à½‘་ཀྱི་གནོད་ངན་འབྱུང་ནིའི་ལཱ་ཅི་འབད་ནི་འབད་དོà¼\n"
+"འཕྲོ་མà½à½´à½‘་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རà¾à¾±à½–སà¼\n"
+" ?] "
+
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+msgid "Abort."
+msgstr "བར་བཤོལ་འབདà¼"
+
+#: cmdline/apt-get.cc:889
+msgid "Do you want to continue [Y/n]? "
+msgstr "à½à¾±à½¼à½“་ཀྱི་འཕྲོ་མà½à½´à½‘་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
+
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "%s %s་ ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+msgid "Download complete and in download only mode"
+msgstr "ཕབ་ལེན་à½à½–ས་ལམ་རà¾à¾±à½„མ་གཅིག་ནང་མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་ཕབ་ལེན་འབདà¼"
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མà½à½´à½“་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
+"missing་དང་གཅིག་à½à½¢à¼‹à½ à½–ད་རྩོལ་བསà¾à¾±à½ºà½‘་ནི་ཨིན་ན་?"
+
+#: cmdline/apt-get.cc:990
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à½²à¼‹à½ à½–ད་བསà¼"
+
+#: cmdline/apt-get.cc:995
+msgid "Unable to correct missing packages."
+msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོà¼"
+
+#: cmdline/apt-get.cc:1030
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འà½à½´à¼‹à½ à½–ད་ནི་སེམས་à½à½¢à¼‹à½–ཞག\n"
+
+#: cmdline/apt-get.cc:1040
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསà¾à¾±à½ºà½‘་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བསà¼\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསà¾à¾²à½‘་མ་གà½à½„་པསà¼à¼‹\n"
+
+#: cmdline/apt-get.cc:1069
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "གྱིས་བྱིན་à½à½ºà¼‹à½¡à½¼à½‘་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་འདི་བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་ཨིནà¼\n"
+
+#: cmdline/apt-get.cc:1081
+msgid " [Installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོདà¼]"
+
+#: cmdline/apt-get.cc:1086
+msgid "You should explicitly select one to install."
+msgstr "à½à¾±à½¼à½‘་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གà½à½“་འà½à½£à¼‹à½¦à¾¦à½ºà¼‹à½‚ཅིག་སེལ་འà½à½´à¼‹à½ à½–ད་དགོ"
+
+#: cmdline/apt-get.cc:1091
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་འདི་འà½à½¼à½–་མི་ཚུགས་པས་ འདི་འབདà½à¼‹à½‘་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཞན་ཅིག་གིས་གྲོས་བསྟུན་འབད་དེ་ཡོདà¼\n"
+"འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་ ཡང་ན་\n"
+"འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རà¾à¾±à½„མ་ཅིག་འà½à½¼à½–་ཚུགསཔ་ཨིན་པསà¼\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
+
+#: cmdline/apt-get.cc:1113
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
+
+#: cmdline/apt-get.cc:1133
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བà½à½´à½–་པསà¼\n"
+
+#: cmdline/apt-get.cc:1141
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འà½à½¼à½“་རིམ་གསར་ཤོས་ཅིག་ཨིནà¼\n"
+
+#: cmdline/apt-get.cc:1168
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འà½à½¼à½–་པསà¼"
+
+#: cmdline/apt-get.cc:1170
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "'%s'་གི་དོན་ལུ་འà½à½¼à½“་རིམ་'%s'་དེ་མ་འà½à½¼à½–་པསà¼"
+
+#: cmdline/apt-get.cc:1176
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འà½à½´à¼‹à½ à½–ད་ཡོད་པའི་འà½à½¼à½“་རིམ་'%s'(%s)\n"
+
+#: cmdline/apt-get.cc:1313
+msgid "The update command takes no arguments"
+msgstr "དུས་མà½à½´à½“་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབདà¼"
+
+#: cmdline/apt-get.cc:1326
+msgid "Unable to lock the list directory"
+msgstr "à½à½¼à¼‹à½–ཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རà¾à¾±à½–་མ་ཚུགསà¼"
+
+#: cmdline/apt-get.cc:1384
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འà½à½–་ནུག"
+
+#: cmdline/apt-get.cc:1403
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསà¾à¾±à½ºà½‘་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་à½à½£à¼‹à½¡à½¼à½‘à¼"
+
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "%s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འཚོལ་མ་à½à½¼à½–à¼"
+
+#: cmdline/apt-get.cc:1516
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འà½à½´à¼‹à½ à½–ད་དོà¼\n"
+
+#: cmdline/apt-get.cc:1546
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་à½à¾±à½¼à½‘་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
+
+#: cmdline/apt-get.cc:1549
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"མ་ཚང་བའི་རྟེན་འབྲེལ་ à½à½´à½¦à¼‹à½¦à¾’ྲིལ་མེད་མི་ཚུ་དང་གཅིག་à½à½¢à¼‹ 'apt-get -f install'དེ་འབà½à¼‹à½¢à¾©à½¼à½£à¼‹à½–སà¾à¾±à½ºà½‘པà¼"
+"(ཡང་ན་à½à½–ས་ཤེས་ཅིག་གསལ་བཀོད་འབདà¼)"
+
+#: cmdline/apt-get.cc:1561
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ལ་ལུ་ཅིག་གཞི་བཙུགས་འབད་མ་ཚུགས༠འ་ནི་གི་དོན་དག་དེ་à½à¾±à½¼à½‘་ཀྱི་ མི་སྲིད་པའི་དུས་སà¾à½–ས་ཅིག་ཞུ་བ་"
+"འབད་འབདà½à¼‹à½ à½¼à½„་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསà¾à¾²à½´à½“་མ་འབད་བར་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
+"འབྱོར་གྱི་ཕྱི་à½à½¢à¼‹à½¢à¾©à¼‹à½–སà¾à¾²à½‘་བà½à½„་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འà½à½–་དོ་ཡོདཔ་འོང་ནི་ཨིན་པསà¼"
+
+#: cmdline/apt-get.cc:1569
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"ད་ཚུན་à½à¾±à½¼à½‘་ཀྱི་བཀོལ་སྤྱོད་རà¾à¾±à½„་པ་ཅིག་རà¾à¾±à½„་པ་ རà¾à¾±à½„མ་ཅིག་ཞུ་བ་འབད་ཡོདཔ་ལས་ ཧ་ཅང་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གཞི་"
+"བཙུགས་འབད་མི་བà½à½´à½–་ནི་དེ་སྲིད་ནི་བཟུམ་ཅིག་དང་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དི་གི་à½à¼‹à½à½‘་དུ་རà¾à¾±à½ºà½“་གྱི་སྙན་ཞུ་འདི་བཀང་བཞག་དགོ"
+
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སà¾à½–ས་འདི་མོས་མà½à½´à½“་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:1577
+msgid "Broken packages"
+msgstr "ཆད་པ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུà¼"
+
+#: cmdline/apt-get.cc:1603
+msgid "The following extra packages will be installed:"
+msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½ºà½–ས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
+
+#: cmdline/apt-get.cc:1674
+msgid "Suggested packages:"
+msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ:"
+
+#: cmdline/apt-get.cc:1675
+msgid "Recommended packages:"
+msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ:"
+
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "
+msgstr "ཡར་བསà¾à¾±à½ºà½‘་རྩིས་བà½à½¼à½“་དོ་... "
+
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: cmdline/apt-get.cc:1703
+msgid "Done"
+msgstr "འབད་ཚར་ཡིà¼"
+
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ དཀའ་ངལ་མོས་མà½à½´à½“་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་à½à½£à¼‹à½¡à½¼à½‘à¼"
+
+#: cmdline/apt-get.cc:1876
+msgid "Must specify at least one package to fetch source for"
+msgstr "གི་དོན་ལུ་འབྱུང་à½à½´à½„ས་ལེན་ནི་ལུ་ཉུང་མà½à½ à¼‹à½¢à½„་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཅིག་ལེན་དགོ"
+
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "%s་གི་དོན་ལུ་འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་འཚོལ་མ་འà½à½¼à½–"
+
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
+
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr " %s་ནང་à½à¾±à½¼à½‘་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
+
+#: cmdline/apt-get.cc:1979
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་à½à½´à½„ས་ཡིག་མཛོད་ཀྱི་%sBà¼\n"
+
+#: cmdline/apt-get.cc:1982
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "འབྱུང་à½à½´à½„ས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསསà¼\n"
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "%s་འབྱུང་à½à½´à½„ས་ལེནà¼\n"
+
+#: cmdline/apt-get.cc:2019
+msgid "Failed to fetch some archives."
+msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: cmdline/apt-get.cc:2047
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོà¼\n"
+
+#: cmdline/apt-get.cc:2059
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
+
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "'dpkg-dev'་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གà½à½„་འབདà¼\n"
+
+#: cmdline/apt-get.cc:2077
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
+
+#: cmdline/apt-get.cc:2096
+msgid "Child process failed"
+msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ནུག"
+
+#: cmdline/apt-get.cc:2112
+msgid "Must specify at least one package to check builddeps for"
+msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མà½à½ à¼‹à½¢à½„་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
+
+#: cmdline/apt-get.cc:2140
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགསà¼"
+
+#: cmdline/apt-get.cc:2160
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
+
+#: cmdline/apt-get.cc:2212
+#, 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:2264
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སà¾à½¼à½„་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་à½à½´à½˜à¼‹à½¦à¾’རིལ་%s་གི་འà½à½¼à½“་རིམ་"
+"ཚུ་འà½à½¼à½–་མ་ཚུགསཔ་ལས་བརྟེན་འà½à½¼à½“་རིམ་དགོས་མà½à½¼à¼‹à½šà½´à¼‹à½‚ི་རེ་བ་དོ་སà¾à½¼à½„་མ་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:2299
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སà¾à½¼à½„་ནི་འདི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་à½à½´à½˜à¼‹"
+"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པསà¼"
+
+#: cmdline/apt-get.cc:2324
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ནུག"
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པསà¼"
+
+#: cmdline/apt-get.cc:2342
+msgid "Failed to process build dependencies"
+msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིནà¼"
+
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"
+msgstr "རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½ à½–ད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
+
+#: cmdline/apt-get.cc:2415
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"ལག་ལེན་:apt-get [options] command\n"
+"apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get འདི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་དང་\n"
+"གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ འཇམ་སམ་བརྡ་བཀོད་གྲལ་à½à½²à½‚་གི་ངོས་འདྲ་བ་ཅིག་ཨིན༠མང་ཤོས་རང་་སྦེ་རང་"
+"ལག་ལེན་འà½à½–་ཡོད་པའི་བརྡ་བཀོད་ཚུ་\n"
+" དུས་མà½à½´à½“་དང་གཞི་བཙུགས་འབད་ནི་དེ་ཨིནà¼\n"
+"\n"
+"བརྡ་བཀོད་ཚུ་:\n"
+" update - འདི་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་གི་à½à½¼à¼‹à½¡à½²à½‚་གསརཔ་ཚུ་སླར་འདྲེན་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" upgrade - འདི་གིས་ ཡར་བསà¾à¾±à½ºà½‘་ཀྱི་ལཱ་འགན་ཅིག་འགྲུབ་ཨིནà¼\n"
+" install - འདི་གིས་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་(pkg is libc6 not libc6.deb)གསརཔ་་ཚུ་གཞི་བཙུགས་འབདà½à¼‹"
+"ཨིནà¼\n"
+" remove -འདི་གིས་ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རྩ་བསà¾à¾²à½‘་གà½à½„མ་ཨིནà¼\n"
+" source - འདི་གིས་འབྱུང་à½à½´à½„ས་ཀྱི་ཡིག་མཛོད་ཚུ་ཕབ་ལེན་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" build-dep - འདི་གིས་འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་ཚུ་རིམ་སྒྲིག་འབདà½à¼‹"
+"ཨིནà¼\n"
+" dist-upgrade - འདི་གིས་ བགོ་བཀྲམ་འདི་ཡར་བསà¾à¾±à½ºà½‘་འབདà½à¼‹à½¨à½²à½“༠apt-get(8)ལུ་བལྟà¼\n"
+" dselect-upgrade - འདི་གིས་ སེལ་འà½à½´à¼‹à½–ཤོལ་གྱི་ སེལ་འà½à½´à¼‹à½šà½´à¼‹à½ à½–དà½à¼‹à½¨à½²à½“à¼\n"
+" clean - འདི་གིས་ ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་མཛོད་ཀྱི་ཡིག་སྣོད་ཚུ་ཀྲེག་གà½à½„མ་ཨིནà¼\n"
+" autoclean -འདི་གིས་ ཕབ་ལེན་འབད་འབདà½à¼‹à½¢à¾™à½²à½„མ་གྱི་ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་ཀྲེག་གà½à½„མ་ཨིནà¼\n"
+" check - ཆད་པ་འགྱོ་འགྱོ་བའི་རྟེན་འབྲེལ་ཚུ་མེདཔ་སྦེ་བདེན་སྦྱོར་འབདà½à¼‹à½¨à½²à½“à¼\n"
+"\n"
+"གདམ་à½à¼‹à½šà½´à¼‹:\n"
+" -h འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -q དྲན་དེབ་འབད་བà½à½´à½–་པའི་ཨའུཊི་པུཊི་ -ཡར་འཕེལ་གྱི་བརྡ་སྟོན་མིན་འདུག\n"
+" -qq འཛོལ་བ་ཚུ་གི་དོན་ལུ་རà¾à¾±à½„མ་ཅིག་མ་གà½à½¼à½‚ས་ཨའུཊི་པུཊི་མིན་འདུག\n"
+" -d ཕབ་ལེན་རà¾à¾±à½„མ་ཅིག་ཨིན་- གཞི་བཙུགས་ཡང་ན་ཡིག་མཛོད་ཚུ་སྦུང་ཚན་བཟོ་བཤོལ་མ་འབདà¼\n"
+" -s བྱ་བ་མིན་འདུག གོ་རིམ་མཚུངས་བཟོ་གི་ལས་འགན་འགྲུབà¼\n"
+" -y འདྲི་དཔྱད་གེ་རང་ལུ་ཨིནམ་སྦེ་ཚོད་དཔག་བཞིནམ་ལས་ནུས་སྤེལ་མ་འབདà¼\n"
+" -f ཆིག་སྒྲིལ་ཞིབ་དཔྱད་འདི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་པ་ཅིན་ འཕྲོ་མà½à½´à½‘་འབད་ནི་ལུ་དཔའ་བཅམà¼\n"
+" -m ཡིག་མཛོད་འདི་ཚུ་ག་ཡོད་འཚོལ་མ་à½à½¼à½–་པ་ཅིན་འཕྲོ་མà½à½´à½‘་ནི་ལུ་དཔའ་བཅམà¼\n"
+" -u ཡར་བསà¾à¾±à½ºà½‘་བཟོ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཡང་་སྟོནà¼\n"
+" -b འདི་ལེན་ཚར་བའི་ཤུལ་ལས འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་བཟོ་བརྩིགས་འབདà¼\n"
+" -V བརྡ་དོན་ལེ་ཤཱ་གི་འà½à½¼à½“་རིམ་ཨང་གྲངས་ཚུ་སྟོནà¼\n"
+" -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n"
+" -o=? མà½à½´à½“་སྒྲིག་གདམ་à½à¼‹à½‚ི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་ དཔེན་ན་-o dir::cache=/tmp\n"
+"བརྡ་དོན་དང་གདམ་à½à¼‹à½šà½´à¼‹à½§à½ºà½„་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt.conf(5)"
+"ལག་à½à½¼à½‚་\n"
+"ཤོག་ལེབ་ཚུ་ལུ་བལྟà¼\n"
+" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོདà¼\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "ཨེབà¼"
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "ལེན:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "ཨེལ་ཇི་ཨེན:"
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "ཨི་ཨར་ཨརà¼"
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིནà¼\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [ལཱ་འབད་དོà¼]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"བརྡ་ལམ་བསྒྱུར་བཅོས:à½à¼‹à½¡à½²à½‚་བཀོད་ཡོད་པའི་ཌིསིཀ་འདི་\n"
+" '%s'\n"
+"འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབà¼\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "མ་ཤེས་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དྲན་à½à½¼à¼"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs་ འདི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་ འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན༠-s "
+"གདམ་à½à¼‹à½ à½‘ི་ ཡིག་སྣོད་ཀྱི་དབྱེ་à½à½‚་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
+"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འà½à½–་སྟེ་ཡོདཔ་ཨིནà¼\n"
+"\n"
+"གདམ་à½à¼‹à½šà½´:\n"
+" -h འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདà½à¼‹à½¨à½²à½“à¼\n"
+" -s འདི་གིས་འབྱུང་à½à½´à½„ས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འà½à½–་ཨིནà¼\n"
+" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིནà¼\n"
+" -o=? འདི་གིས་ མà½à½´à½“་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་à½à¼‹à½šà½´à¼‹à½à½žà½²à¼‹à½¦à¾’ྲིག་འབདà½à¼‹à½¨à½²à½“་ དཔེར་ན་-o dir::cache=/"
+"tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "འཕྲོ་མà½à½´à½‘་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབà¼"
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིནà¼à¼‹à½ à¼‹à½“ི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+"ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རà¾à¾±à½ºà½“་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ནང་ལུ་གྲུབ་འབྲས་འà½à½¼à½“་འོང་༠"
+"འདི་དེ་བà½à½´à½–་པས་"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"འ་ནི་འཕྲིན་དོན་གྱི་ལྟག་ལས་ཡོད་པའི་འཛོལ་བ་དེ་ཚུ་གལ་ཅན་ཅིག་ཨིན༠འདི་ཚུ་གི་དཀའ་ངལ་སེལ་བཞིནམ་ལས་ "
+"[I] གཞི་བཙུགས་དེ་ལོག་སྟེ་རང་གཡོག་བཀོལà¼"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "འà½à½¼à½–་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོà¼"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "རྒྱུད་དུང་ཚུ་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འà½à½–་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+msgid "Corrupted archive"
+msgstr "ངན་ཅན་གྱི་ཡིག་མཛོདà¼"
+
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
+msgstr "ཊར་ཅེག་སམ་དེ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འà½à½´à½¦à¼‹à½˜à½²à¼‹ %sà¼"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགསà¼"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "ཡིག་མཛོད་འà½à½´à½¦à¼‹à½˜à½²à¼‹à½˜à½‚ོ་ཡིག་ལྷག་ནིའི་འཛོལ་བà¼"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "ནུས་མེད་ཡིག་མཛོད་འà½à½´à½¦à¼‹à½˜à½²à¼‹à½‚ི་མགོ་ཡིག་"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་à½à½´à½„་ཀུ་འདུག"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མà½à½´à½‘་མཚམས་གུར་བཀོག་བཞག་མà½à½´à½‘་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོདà¼"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད!"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "à½à¼‹à½•à¾±à½¼à½‚ས་སྤྲོད་བཞག་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "à½à¼‹à½•à¾±à½¼à½‚ས་à½à¼‹à½¦à¾à½¼à½„་རà¾à¾±à½–་ནི་ནང་ ནང་འà½à½¼à½‘་ཀྱི་འཛོལ་བà¼"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "%s -> %s ་དང་ %s/%s་à½à¼‹à½•à¾±à½¼à½‚ས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསà¾à¾±à½ºà½‘་དོà¼"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s་à½à¼‹à½•à¾±à½¼à½‚ས་ཀྱི་ལོག་བལྟབ་à½à¼‹à½¦à¾à½¼à½„་à¼"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོà¼"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½–སྡམས་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "སྣོད་à½à½¼à¼‹%s་འདི་à½à¼‹à½•à¾±à½¼à½‚ས་སྒྱུར་དེ་ཡོདà¼"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གà½à½‘་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསà¾à¾±à½ºà½‘པ་དེ་ཡོདà¼"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "à½à¼‹à½¦à¾’ྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པསà¼"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིནà¼"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "à½à½¼à½„་རའི་དྲྭ་རྟགས༠(#)རྡོབ་ནང་ལུ་མà½à½´à½‘་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པསà¼"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དེ་གིས་འà½à½¼à½“་རིམ་གཅིག་ད་ཡང་མà½à½´à½“་སྒྲིག་མི་འབད་བསà¼"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདà½à¼‹à½¨à½²à½“à¼"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགསà¼"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགསà¼"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "%s་རྩ་བསà¾à¾²à½‘་གà½à½„་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "%s་གསར་བསà¾à¾²à½´à½“་འབད་མ་ཚུགསà¼"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "info ་དང་ temp་སྣོད་à½à½¼à¼‹à½šà½´à¼‹à½¡à½²à½‚་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིནà¼"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½¼à¼‹à½¡à½²à½‚་ཚུ་ལྷག་དོà¼"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "བདག་སà¾à¾±à½¼à½„་སྣོད་à½à½¼à¼‹ %sinfo་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་གིས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་མིང་ཅིག་ལེན་དོà¼"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "ཡིག་à½à½¼à¼‹à½–ཀོད་འབད་མི་ཚུ་ལྷག་དོà¼"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"'%sinfo/%s'ཡིག་སྣོད་à½à½¼à½‚་ཡིག་à½à¼‹à½•à¾±à½ºà¼‹à½“ི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད༠à½à¾±à½¼à½‘་ཀྱི་ཡིག་སྣོད་འདི་སོར་ཆུད་འབད་མ་ཚུགས་པ་"
+"ཅིན་ འདི་སྟོངམ་བཟོ་བཞིནམ་ལས་ དེ་འཕྲལ་ལས་རང་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་འà½à½¼à½“་རིམ་གཅིགཔ་འདི་རང་ལོང་གཞི་བཙུགས་འབདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "%sinfo/%s་ཡིག་སྣོད་à½à½¼à¼‹à½–ཀོད་འདི་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་གིས་མà½à½´à½‘་མཚམས་ལེན་དོà¼"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "à½à¼‹à½•à¾±à½¼à½‚ས་ཡིག་སྣོད་%sdiversionsཚུ་à½à¼‹à½•à¾±à½ºà¼‹à½“ི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "à½à¼‹à½•à¾±à½¼à½‚ས་ཡིག་སྣོད་འདི་ངན་ཅན་འགྱོ་ནུག"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "%s་à½à¼‹à½•à¾±à½¼à½‚ས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་à½à½²à½‚"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་ à½à¼‹à½•à¾±à½¼à½‚ས་ཅིག་à½à¼‹à½¦à¾à½¼à½„་རà¾à¾±à½–་དོà¼"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "པི་ཀེ་ཇི་ འདྲ་མཛོད་དེ་ དང་པ་རང་འགོ་བྱེད་འབད་དགོ"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་འཚོལ་་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིན:མགོ་ཡིག་ པར་ལེན%lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "གནད་ཚད་ཡིག་སྣོད་དབྱེ་ཚན་ནང་ལུ་ རིམ་སྒྲིག་ཡིག་སྣོད་བྱང་ཉེས༠པར་ལེན་ %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ༠པར་ལེན་ %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འà½à½´à½¦à¼‹à½˜à½²à¼‹à½–རླག་སྟོར་ཞུགས་དོà¼"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "འ་ནི་འདི་ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ འདི་ལུ་'%s'ཡང་ན་'%s'འà½à½´à½¦à¼‹à½˜à½²à¼‹à½˜à½²à½“་འདུག"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགསà¼"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ འà½à½´à½¦à¼‹à½˜à½²à¼‹à½‚་ཡོད་འཚོལ་མ་à½à½¼à½–à¼"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིནà¼"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "མིང་དཔྱད་འབད་མ་བà½à½´à½–་པའི་ཚད་འཛིན་ཡིག་སྣོདà¼"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "སི་ཌི་རོམ་གནད་སྡུད་གཞི་རྟེན་%s་འདི་ལྷག་མ་ཚུགསà¼"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"འ་ནི་སི་ཌི་-རོམ་འདི་ཨེ་པི་ཊི་་གིས་ ངོས་འཛིན་འབད་ཚུགསཔ་སྦེ་བཟོ་ནིའི་་དོན་ལུ་ ཨེ་པི་ཊི་-སི་ཌི་རོམ་ལག་ལེན་"
+"འà½à½–་གནང༠apt-get་དུས་མà½à½´à½“་བཟོ་ནི་དེ་ སི་ཌི་-རོམས་གསརཔ་à½à¼‹à½¦à¾à½¼à½„་རà¾à¾±à½–་ནི་ལུ་ལག་ལེན་འà½à½–་མི་བà½à½´à½–à¼"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "སི་དི་-རོམ་ཕྱི་འགྱུརà¼"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"%s་ནང་་སི་ཌི་-རོམ་འདི་བརྩེགས་བཤོལ་འབད་མ་ཚུགས་ འདི་ད་ལྟོ་ཡང་ལག་ལེན་འà½à½–་སྟེ་ཡོདཔ་འོང་ནི་མསà¼"
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "ཌིཀསི་དེ་འཚོལ་མ་à½à½¼à½–à¼"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "ཡིག་སྣོད་འཚོལ་མ་à½à½¼à½–à¼"
+
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབà½à¼‹à½“ི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་ ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་à½à½¢à¼‹à½ à½‚ོ་བཙུགས་ནི་མི་འོང་à¼"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "ནང་བསà¾à¾±à½¼à½‘་འབད་དོà¼"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "དོ་བཉམ་གི་མིང་འདི་གà½à½“་འབེབས་བཟོ་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "ཉེ་གནས་མིང་འདི་གà½à½“་འབེེབས་བཟོ་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "སར་བར་འདི་གིས་ མà½à½´à½‘་ལམ་འདི་ངོས་ལེན་འབད་མ་བà½à½´à½–་པར་སླབ་མས: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "ལག་ལེན་པ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "རྩི་སྤྲོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདà½à¼‹à½‘་ ནང་བསà¾à¾±à½¼à½‘་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::"
+"ProxyLoginའདི་སྟོངམ་ཨིན་པསà¼"
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "ནང་བསà¾à¾±à½¼à½‘་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འà½à½¼à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "ཡིག་དཔར་རà¾à¾±à½–་མ་བà½à½´à½–་སར་བར་གྱིས་སླབ་མས༠%s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "མà½à½´à½‘་ལམ་ངལ་མཚམས"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "སར་བར་གྱིས་མà½à½´à½‘་ལམ་འདི་à½à¼‹à½–སྡམས་à½à½ºà¼‹à½¡à½¼à½‘པ་ཨིནà¼"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "འཛོལ་བ་ལྷབà¼"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "ལན་གྱིས་ གནད་à½à½¼à½„ས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིནà¼"
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅནà¼"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "འཛོལ་བ་འབྲིà¼"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "སོ་ཀེཊི་ཅིག་གསར་བསà¾à¾²à½´à½“་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིནà¼"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "གནད་སྡུད་སོ་ཀེཊི་མà½à½´à½‘་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མà½à½´à½‘་ལམ་ངལ་མཚམསà¼"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མà½à½´à½‘་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "སོ་ཀེཊི་གི་མིང་འདི་གà½à½“་འབེབས་བཟོ་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བà½à½„་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "མ་ཤེས་པའི་à½à¼‹à½–ྱང་གི་རིགས་ཚན་%u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "ཨི་པི་ཨར་ཊི་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "གནད་སྡུད་སོ་ཀེཊི་ མà½à½´à½‘་ནི་ངལ་མཚམས་བྱུང་ནུག"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "མà½à½´à½‘་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགསà¼"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལà¼"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམསà¼"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "གནད་སྡུད་གནས་སོར་དེ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མསà¼"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "འདྲི་དཔྱདà¼"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "ལས་བཀོལ་འབད་མ་ཚུགསà¼"
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s)་ལུ་མà½à½´à½‘་དོà¼"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསà¾à¾²à½´à½“་འབད་མ་ཚུགསà¼"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "%s:%s (%s)ལུ་མà½à½´à½‘་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགསà¼"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr " %s:%s (%s)ལུ་མà½à½´à½‘་མ་ཚུགས་ མà½à½´à½‘་ལམ་ངལ་མཚམསà¼"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr " %s:%s (%s)ལུ་མà½à½´à½‘་མ་ཚུགསà¼"
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "%s་ལུ་མà½à½´à½‘་དོà¼"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "'%s'མོས་མà½à½´à½“་འབད་མ་ཚུགསà¼"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "'%s'མོས་མà½à½´à½“་འབད་ནི་ལུ་གནས་སà¾à½–ས་ཀྱི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "'%s:%s' (%i)་མོས་མà½à½´à½“་འབདà½à¼‹à½‘་ངན་པ་ཅིག་བྱུང་ཡིà¼"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "%s %s:ལུ་མà½à½´à½‘་མ་ཚུགསà¼"
+
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "'%s'ལྡེ་འà½à½¼à½¢à¼‹à½ à½‘ི་འཛུལ་སྤྱོད་འབད་མ་ཚུགསà¼"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+"E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་à½à½¼à¼‹à½¡à½²à½‚་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་"
+"འà½à½¼à½“་དོà¼"
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"ནང་འà½à½¼à½‘་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདà½à¼‹à½‘་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གà½à½“་འབེབས་བཟོ་"
+"མ་ཚུགས?!"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "ཉུང་མà½à½ à¼‹à½¢à½„་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་à½à½´à½‚་བྱུང་སྟེ་ཡོདཔ་ཨིནà¼"
+
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འà½à½–་མ་ཚུགས༠(gnupg་དེ་à½à½žà½²à¼‹à½–ཙུགས་འབད་ཡོདཔ་ཨིན་"
+"ན�)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "gpgv་ལག་ལེན་འà½à½–་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་à¼"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པསà¼:\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འà½à½¼à½–་མི་ཚུགས་པས:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོà¼"
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རà¾à¾±à½„་པ་ཅིག་à½à½¼à½–་ཡོདà¼"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "མགོ་ཡིག་གི་གྲལ་à½à½²à½‚་བྱང་ཉེསà¼"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-à½à¾±à½–་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ à½à¾±à½–་ཚད་ཀྱི་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½‘ེ་ཆད་པ་བཟོ་བà½à½„་ནུག"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "སེལ་འà½à½´à¼‹à½ à½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "མà½à½´à½‘་ལམ་ངལ་མཚམས་འབད་ཡོདà¼"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "ཡིག་སྣོད་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ༠à½à½‚་རིང་མཇུག་གི་མà½à½´à½‘་ལམ་དེ་à½à¼‹à½–སྡམསà¼"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བà¼"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེསà¼"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "བà½à½´à½‘་ལམ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "ནང་འà½à½¼à½‘་འཛོལ་བà¼"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "སེལ་འà½à½´à¼‹%s ་མ་འà½à½¼à½–à¼"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½‘ོà¼"
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "གྲལ་à½à½²à½‚་%d་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག(%d་མà½à½¼à¼‹à½¤à½¼à½¦)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་à½à½¢à¼‹à½ à½‚ོ་བཙུགསཔ་ཨིན"
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགསà¼"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མà½à½¼à¼‹à½˜à½ºà½‘་à½à½ºà½–སà¼"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རà¾à¾±à½„མ་ཅིག་བྱིན་ཚུགསà¼"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདà½à¼‹à½£à½ºà¼‹à½¤à½±à¼‹à½‚ྲངས་སུ་བཙུགསཔ་ཨིནà¼"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་à½à½ºà¼‹à½¡à½¼à½‘à¼"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à¼‹à½ à½–ད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱà¼"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མà½à½¼à¼‹à½˜à½ºà½‘་à½à½ºà½–སà¼"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... འཛོལ་བ་!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... འབད་ཚར་ཡོདà¼"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "བརྡ་བཀོད་གྲལ་à½à½²à½‚་གྱི་གདམ་à½à¼‹'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པསà¼"
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "བ་རྡ་བཀོད་གྲལ་à½à½²à½‚་གི་གདམ་à½à¼‹%s་འདི་ཧ་མ་གོ་བསà¼"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "བརྡ་བཀོད་གྲལ་à½à½²à½‚་གི་གདམ་à½à¼‹%s་འདི་བུ་ལིན་མེན་པསà¼"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "གདམ་à½à¼‹%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པསà¼"
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "གདམ་à½à¼‹%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིནà¼"
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "གདམ་à½à¼‹ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མà½à½¼à¼‹à½¡à½¼à½‘པ་ཨིན"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "གདམ་à½à¼‹'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསà¾à¾±à½ºà½‘པà¼"
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "%s ལྷག་ནི་རà¾à¾±à½„མ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རà¾à¾±à½–་ནི་ལག་ལེན་མི་འà½à½–་པསà¼"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ལྡེ་མིག་རà¾à¾±à½–ས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རà¾à¾±à½–་ནི་ལག་ལེན་མི་འà½à½–་པསà¼"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "%sལྡེ་མིག་རà¾à¾±à½–་ནི་ལེན་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདà½à¼‹à½‘་ཕར་མིན་འདུག"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སà¾à¾±à½¼à½“་ཅིག་à½à½¼à½–་ཡོདཔ་ཨིནà¼"
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིནà¼"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་à½à½¼à½“་ཡོདཔ་ཨིནà¼"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདà½à¼‹à½‘་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབà½à¼‹à½‘་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "ཡིག་སྣོད་འདི་à½à¼‹à½–སྡམས་པའི་བསྒང་དཀའ་ངལà¼"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལà¼"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདà½à¼‹à½‘་དཀའ་ངལà¼"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདྲ་མཛོད་སྟོངམà¼"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པསà¼"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མà½à½´à½“་པའི་འà½à½¼à½“་རིམ་ཅིག་ཨིན་པསà¼"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འà½à½¼à½“་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à½²à¼‹à½ à½–ད་བསà¼"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདà½à¼‹à½¨à½²à½“པསà¼"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "རྟེནམ་ཨིནà¼"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིནà¼"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "བསམ་འཆར་བཀོདཔ་ཨིནà¼"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "འོས་སྦྱོར་འབདà½à¼‹à½¨à½²à½“à¼"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "མི་མà½à½´à½“མ་ཨིནà¼"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "ཚབ་བཙུགསཔ་ཨིནà¼"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "ཕན་མེདཔ་བཟོà½à¼‹à½¨à½²à½“à¼"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "གལ་ཅནà¼"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "དགོས་མà½à½¼à¼‹à½¡à½¼à½‘པà¼"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "ཚད་ལྡནà¼"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "གདམ་à½à¼‹à½…ནà¼"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "à½à½ºà½–སà¼"
+
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོà¼"
+
+#: apt-pkg/depcache.cc:62
+msgid "Candidate versions"
+msgstr "མི་ངོ་འà½à½¼à½“་རིམཚུà¼"
+
+#: apt-pkg/depcache.cc:91
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བà½à½¼à½“à¼"
+
+#: apt-pkg/tagfile.cc:72
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "%s (༡་)་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "%s (༢་)་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་ %lu འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་ %lu་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s (dist)གི་ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%lu་ འབྱུང་à½à½¼à¼‹à½¡à½²à½‚་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%lu་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s(ཡང་དག་ dist)གི་ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%lu་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "%s་à½à¼‹à½•à¾±à½ºà¼‹à½‘ོà¼"
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "གྲལ་à½à½²à½‚་%u་འདི་འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%u་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s (དབྱེ་བ)་ནང་ནà¼"
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་à½à½²à½‚་%u་གུར་ལུ་ཡོདཔ་འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s་གི་ནང་ན་མ་ཤེས་པསà¼"
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%u་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ནà¼"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"མི་མà½à½´à½“་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%sà½à½´à½˜à¼‹"
+"སྒྲིལ་ གནས་སà¾à½–ས་ཀྱི་རྩ་བསà¾à¾²à½‘་གà½à½„་ནི་འདི་དགོས་མà½à½¼à¼‹à½¡à½¼à½‘པ་ཨིན༠འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ "
+"འདི་འབདà½à¼‹à½‘་à½à¾±à½¼à½‘་ཀྱི་à½à½‘་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་à½à¼‹à½ à½‘ི་ཤུགས་"
+"ལྡན་བཟོà¼"
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à¼‹à½ à½–ད་བསà¼"
+
+#: apt-pkg/algorithms.cc:241
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདà½à¼‹à½‘་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
+"མ་à½à½¼à½–à¼"
+
+#: apt-pkg/algorithms.cc:1059
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བà½à½¼à½“་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མà½à½´à½“་བཟོà½à¼‹à½¨à½²à½“ འ་ནི་à½à½´à½˜à¼‹"
+"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རà¾à¾±à½ºà½“་ལས་བརྟེན་ཨིན་པསà¼"
+
+#: apt-pkg/algorithms.cc:1061
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ à½à¾±à½¼à½‘་ཀྱི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "à½à½¼à¼‹à½–ཀོད་འབད་མི་སྣོད་à½à½¼à¼‹%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་à½à½ºà¼‹à½ à½‘ུག"
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "ཡིག་མཛོད་སྣོད་à½à½¼à¼‹ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་à½à½ºà¼‹à½ à½‘ུག"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོà¼)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "à½à½–ས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འà½à½¼à½–à¼"
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "à½à½–ས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབདà¼"
+
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "à½à¼‹à½¡à½²à½‚་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་༠'%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབà¼à¼‹"
+
+#: apt-pkg/init.cc:120
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à¼‹à½ à½–ད་བསà¼"
+
+#: apt-pkg/init.cc:136
+msgid "Unable to determine a suitable packaging system type"
+msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གà½à½“་འབེབས་བཟོ་མི་ཚུགས་པསà¼"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"à½à¾±à½¼à½‘་རའི་sources.listགི་à½à½¼à¼‹à½¡à½²à½‚་ནང་ལུ་à½à¾±à½¼à½‘་ཀྱི་ 'འབྱུང་à½à½´à½„ས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½¼à¼‹à½¡à½²à½‚་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ à½à¾±à½¼à½‘་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་à¼"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་à½à½¼à¼‹ à½à½´à½˜à¼‹à½¦à¾’ྲིལ་མགོ་ཡིག་མིན་འདུག"
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགསà¼"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བསà¼"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "འདྲ་མཛོད་ལུ་མà½à½´à½“་འགྱུར་མེན་པའི་འà½à½¼à½“་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "%s (à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:129
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "%s (ལག་ལེན་འà½à½´à½˜à¼‹à½¦à¾’ྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འà½à½¼à½“་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:150
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "%s (ལག་ལེན་འà½à½´à½˜à¼‹à½¦à¾’ྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འà½à½¼à½“་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "%s (ཡིག་སྣོད་འà½à½¼à½“་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr " %s (འà½à½¼à½“་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "%s (ལག་ལེན་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:192
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "%s (འà½à½¼à½“་རིམ་གསརཔ་ ༢)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་à½à¾±à½¼à½‘་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་à½à½´à½–་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་à½à¾±à½¼à½‘་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་à½à½´à½–་པའི་à½à½¼à½“་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་à½à¾±à½¼à½‘་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་à½à½´à½–་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:254
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ %s %s ་འདི་མ་à½à½¼à½–་པསà¼"
+
+#: apt-pkg/pkgcachegen.cc:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½¼à¼‹à½¡à½²à½‚་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགསà¼"
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོà¼"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་à½à½´à½„ས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོà¼"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "%s (%s -> %s)བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནི་འདི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིནà¼"
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "ཨེམ་ཌི་༥་ à½à¾±à½¼à½“་བསྡོམས་མ་མà½à½´à½“་པà¼"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འà½à½¼à½–་མི་ཚུགས་པས:\n"
+
+#: apt-pkg/acquire-item.cc:753
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+" %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འà½à½¼à½–་པས༠འདི་འབདà½à¼‹à½£à½¦à¼‹à½à¾±à½¼à½‘་ཀྱི་ལག་à½à½¼à½‚་ལས་ "
+"འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེནà¼)"
+
+#: apt-pkg/acquire-item.cc:812
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+" %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འà½à½¼à½–་པས༠འདི་འབདà½à¼‹à½£à½¦à¼‹à½à¾±à½¼à½‘་ཀྱི་ལག་à½à½¼à½‚་ལས་ "
+"འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
+
+#: apt-pkg/acquire-item.cc:848
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་དོན་ལུ་ས་སྒོà¼"
+
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr "ཚད་མ་མà½à½´à½“à¼"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+" %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འà½à½–་དོà¼\n"
+"སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོà¼\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "ངོས་འཛིན་འབད་དོ.."
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་à½à¼‹à½¡à½²à½‚:%s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འà½à½–་དོà¼\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོà¼\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "%i་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་ཟུར་à½à½¼à¼‹à½šà½´à¼‹à½à½¼à½–་ཅི་ %i་འབྱུང་à½à½´à½„ས་ཟུར་à½à½¼à¼‹à½šà½´à¼‹à½‘ང་ %iམིང་རྟགས་ཚུà¼\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསà¾à¾±à½ºà½‘à¼\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིནà¼\n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱིà½à½¼à¼‹à½¡à½²à½‚་ཚུ་འདྲ་བཤུས་རà¾à¾±à½–་དོ..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "འབྱུང་à½à½´à½„ས་ཀྱི་à½à½¼à¼‹à½¡à½²à½‚་གསརཔ་ཅིག་འབྲི་དོà¼\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་à½à½´à½„ས་ཧྲིལ་བུ་ཚུ་:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i་དྲན་མà½à½¼à¼‹à½‘ེ་ཚུ་བྲིས་ཡོདà¼\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་à½à½¢à¼‹ %i དྲན་à½à½¼à¼‹à½ à½‘ི་ཚུ་བྲིས་ཡོདà¼\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i་མà½à½´à½“་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་à½à½¢à¼‹ %i་དྲན་à½à½¼à¼‹à½šà½´à¼‹à½–ྲིས་བཞག་ཡོདཔ་ཨིནà¼\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམà½à½´à½“་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་à½à½¢à¼‹ %i དྲན་à½à½¼à¼‹à½ à½‘ི་ཚུ་བྲིས་"
+"ཡོདཔ་ཨིནà¼\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "%s་ གྲ་སྒྲིག་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "%s་རིམ་སྒྲིག་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%sà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s་ རྩ་བསà¾à¾²à½‘་གà½à½„་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "%s་རྩ་བསà¾à¾²à½‘་གà½à½„་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "རྩ་བསà¾à¾²à½‘་བà½à½„་ཡོད་པའི་%s"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་རྩ་བསà¾à¾²à½‘་གà½à½„་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་རྩ་བསà¾à¾²à½‘་བà½à½„་ཡོདà¼"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "དུས་སུ་མ་འབབ་པ་རང་མà½à½´à½‘་ལམ་འདི་ག་བསྡམས་ཡོདà¼"
diff --git a/po/el.po b/po/el.po
index 9988e9fc2..e17436928 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,3 +1,4 @@
+# translation of apt_po_el_new.po to Greek
# translation of apt_po_el.po to
# translation of apt_po_el.po to Greek
# translation of apt_po_el.po to
@@ -7,30 +8,31 @@
# Greek Translation of APT.
# This file is put in the public domain.
# Fanis Dokianakis <madf@hellug.gr>, 2003.
-# Konstantinos Margaritis <markos@debian.org>, 2003, 2004.
+# Konstantinos Margaritis <markos@debian.org>, 2003, 2004, 2006.
# George Papamichelakis <george@step.gr>, 2004.
# George Papamichalakis <george@step.gr>, 2004.
# Greek Translation Team <debian-l10n-greek@lists.debian.org>, 2005.
+# quad-nrg.net <galaxico@quad-nrg.net>, 2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt_po_el\n"
+"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-07-14 14:25EEST\n"
-"Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
-"org>\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-01-18 15:16+0200\n"
+"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"org>\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Το πακέτο %s έκδοσης %s έχει ανεπίλυτες εξαÏτήσεις:\n"
+msgstr "Το πακέτο %s με έκδοση %s έχει ανεπίλυτες εξαÏτήσεις:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
@@ -159,14 +161,14 @@ msgstr " Πίνακας Έκδοσης:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -241,6 +243,19 @@ msgstr ""
" -o=? ΧÏήση μιας αυθαίÏετη επιλογής Ïυθμίσεων, πχ -o dir::cache=/tmp\n"
"Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληÏοφοÏίες.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"ΠαÏακαλώ δώστε ένα όνομα για τον δίσκο αυτό, όπως 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "ΠαÏακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Τα οÏίσματα δεν είναι σε ζεÏγη"
@@ -303,7 +318,7 @@ msgstr ""
" -c=? Ανάγνωση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου Ïυθμίσεων\n"
" -o=? ΚαθοÏισμός αυθαίÏετης επιλογής παÏαμέτÏου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "ΑδÏνατη η εγγÏαφή στο %s"
@@ -429,115 +444,126 @@ msgstr "Δεν ταιÏιαξε καμία επιλογή"
msgid "Some files are missing in the package file group `%s'"
msgstr "Λείπουν μεÏικά αÏχεία από την ομάδα πακέτων '%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Η βάση είναι κατεστÏαμμένη, το αÏχείο μετονομάστηκε σε %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Η βάση δεν είναι ενημεÏωμένη, γίνεται Ï€Ïοσπάθεια να αναβαθμιστεί το %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Το άνοιγμά του αÏχείου της βάσης %s: %s απέτυχε"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Η ημεÏομηνία του αÏχείου %s έχει αλλάξει"
+msgid "Failed to stat %s"
+msgstr "Αποτυχία εÏÏεσης της κατάστασης του %s."
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Η αÏχειοθήκη δεν πεÏιέχει πεδίο ελέγχου"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "ΑδÏνατη η Ï€Ïόσβαση σε δείκτη"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: ΑδÏνατη η ανάγνωση του καταλόγου %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: ΑδÏνατη η εÏÏεση της κατάστασης του %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Σφάλματα στο αÏχείο"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "ΑδÏνατη η εÏÏεση του %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Αποτυχία ανεÏÏεσης"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "ΑποσÏνδεση %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Αποτυχία ανάγνωσης του %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Αποτυχία αποσÏνδεσης του %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr " Αποτυχία σÏνδεσης του %s με το %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " ΑποσÏνδεση οÏίου του %sB hit.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Αποτυχία εÏÏεσης της κατάστασης του %s."
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Η αÏχειοθήκη δεν πεÏιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν πεÏιέχει εγγÏαφή παÏάκαμψης\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηÏητής είναι ο %s όχι ο %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s δεν πεÏιέχει εγγÏαφή παÏάκαμψης\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s δεν πεÏιέχει εγγÏαφή παÏάκαμψης\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -633,80 +659,79 @@ msgstr "ΠÏόβλημα κατά την αποσÏνδεση του %s"
msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαÏτήσεις:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s Ï€Ïόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "αλλά δεν Ï€Ïόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " η"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ÎΕΑ πακέτα θα εγκατασταθοÏν:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥÎ:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστοÏν:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥÎ:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κÏατημένα πακέτα θα αλλαχθοÏν:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -714,179 +739,180 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαÏαίτητα πακέτα θα αφαιÏεθοÏν\n"
"Αυτό ΔΕΠθα έπÏεπε να συμβεί, εκτός αν ξέÏετε τι ακÏιβώς κάνετε!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιÏεθοÏν και %lu δεν αναβαθμίζονται.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήÏως εγκατεστημένα ή αφαιÏέθηκαν.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "ΔιόÏθωση εξαÏτήσεων..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " απέτυχε."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "ΑδÏνατη η διόÏθωση των εξαÏτήσεων"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "ΑδÏνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Ετοιμο"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Ίσως να Ï€Ïέπει να Ï„Ïέξετε apt-get -f install για να διοÏθώσετε αυτά τα "
"Ï€Ïοβλήματα."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε με το -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακÏιβώθηκαν!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "ΠαÏάκαμψη Ï€Ïοειδοποίησης ταυτοποίησης.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Εγκατάσταση των πακέτων χωÏίς επαλήθευση [ν/Ο]; "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "ΜεÏικά πακέτα δεν εξαακÏιβώθηκαν"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "ΥπάÏχουν Ï€Ïοβλήματα και δώσατε -y χωÏίς το --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "ΕσωτεÏικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"ΜεÏικά πακέτα Ï€Ïέπει να αφαιÏεθοÏν αλλά η ΑφαίÏεση είναι απενεÏγοποιημένη."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "ΕσωτεÏικό Σφάλμα στην Ï€Ïοσθήκη μιας παÏάκαμψης"
+msgstr "ΕσωτεÏικό Σφάλμα, η Ταξινόμηση δεν ολοκληÏώθηκε"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "ΑδÏνατο το κλείδωμα του καταλόγου μεταφόÏτωσης"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "ΑδÏνατη η ανάγνωση της λίστας πηγών."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Î Î¿Î»Ï Ï€ÎµÏίεÏγο! Τα μεγέθη δεν ταιÏιάζουν, στείλτε μήνυμα στο apt@packages."
+"debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB/%sB από αÏχεία.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB από αÏχεία.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Μετά την αποσυμπίεση θα χÏησιμοποιηθοÏν %sB χώÏου από το δίσκο.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθεÏωθοÏν %sB χώÏου από το δίσκο.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s"
+msgstr "Δεν μπόÏεσα να Ï€ÏοσδιοÏίσω τον ελεÏθεÏο χώÏο στο %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "ΚαθοÏίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εÏγασία"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Îαι, κανε ότι λέω!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"ΠÏόκειται να κάνετε κάτι εξαιÏετικά επικίνδυνο\n"
+"ΠÏόκειται να κάνετε κάτι πιθανόν Ï€Î¿Î»Ï ÎµÏ€Î¹Î¶Î®Î¼Î¹Î¿.\n"
"Για να συνεχίσετε πληκτÏολογήστε τη φÏάση '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Εγκατάλειψη."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Î/ο]; "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Για μεÏικά αÏχεία απέτυχε η μεταφόÏτωση"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "ΟλοκληÏώθηκε η μεταφόÏτωση μόνο"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -894,49 +920,49 @@ msgstr ""
"ΑδÏνατη η μεταφόÏτωση μεÏικών αÏχείων, ίσως αν δοκιμάζατε με apt-get update "
"ή το --fix-missing;"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηÏίζεται για την ÏŽÏα"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "ΑδÏνατη η επίλυση των χαμένων πακέτων."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Εγκατάλειψη της εγκατάστασης."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"ΠαÏάκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οÏιστεί.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιÏεθεί\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Το πακέτο %s είναι εικονικό και παÏέχεται από τα:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Εγκατεστημένα]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Θα Ï€Ïέπει επακÏιβώς να επιλέξετε ένα για εγκατάσταση."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -948,51 +974,51 @@ msgstr ""
"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
"από άλλη πηγή\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "ΠάÏαυτα το ακόλουθο πακέτο το αντικαθιστά:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόÏτωσή "
"του\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το%s δεν βÏέθηκε"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βÏέθηκε"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίÏνει οÏίσματα"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "ΑδÏνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1000,25 +1026,46 @@ msgstr ""
"ΜεÏικά αÏχεία δεν μεταφοÏτώθηκαν, αγνοήθηκαν ή χÏησιμοποιήθηκαν παλαιότεÏα "
"στη θέση τους."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Οι ακόλουθες πληÏοφοÏίες ίσως βοηθήσουν στην επίλυση του Ï€Ïοβλήματος:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"ΕσωτεÏικό Σφάλμα, η Ï€Ïοσπάθεια επίλυσης του Ï€Ïοβλήματος \"έσπασε\" κάποιο "
+"υλικό"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ΕσωτεÏικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "ΑδÏνατη η εÏÏεση του πακέτου %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν Ï„Ïέξετε 'apt-get f install' ίσως να διοÏθώσετε αυτά τα Ï€Ïοβλήματα:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1073,7 @@ msgstr ""
"Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε 'apt-get -f install' χωÏίς να οÏίσετε "
"πακέτο (ή καθοÏίστε μια λÏση)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1038,7 +1085,7 @@ msgstr ""
"διανομή, ότι μεÏικά από τα πακέτα δεν έχουν ακόμα δημιουÏγηθεί ή έχουν\n"
"μετακινηθεί από τα εισεÏχόμενα."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1048,118 +1095,120 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα Ï€Ïέπει να κάνετε μια\n"
"αναφοÏά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Οι ακόλουθες πληÏοφοÏίες ίσως βοηθήσουν στην επίλυση του Ï€Ïοβλήματος:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθοÏν:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "ΠÏοτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "ΕσωτεÏικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
+msgstr ""
+"ΕσωτεÏικό Σφάλμα, η Ï€Ïοσπάθεια επίλυσης του Ï€Ïοβλήματος \"έσπασε\" κάποιο "
+"υλικό"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για να μεταφοÏτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ΠαÏάκαμψη του ήδη μεταφοÏτωμένου αÏχείου `%s`\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "ΜεταφόÏτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόÏτωσης μεÏικών αÏχειοθηκών."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ΠαÏάκαμψη της αποσυμπίεσης ήδη μεταφοÏτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Η απογονική διεÏγασία απέτυχε"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαÏτήσεων του"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ΑδÏνατη η εÏÏεση πληÏοφοÏιών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαÏτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1216,7 @@ msgid ""
msgstr ""
"%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή το πακέτο %s δεν βÏέθηκε"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1225,32 @@ msgstr ""
"%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή δεν υπάÏχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιοÏν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαÏτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτεÏο"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάÏτησης για το %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαÏτήσεις χτισίματος για το %s δεν ικανοποιοÏνται."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεÏγασίας εξαÏτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "ΥποστηÏιζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1256,9 +1305,9 @@ msgstr ""
" install - Εγκατάσταση νέων πακέτων (χωÏίς την επέκταση .deb)\n"
" remove - ΑφαίÏεση πακέτων\n"
" source - ΜεταφόÏτωση πακέτων πηγαίου κώδικα\n"
-" build-dep - ΡÏθμιση εξαÏτήσεων χτισίματοςγια πακέτα πηγαίου κώδικα\n"
+" build-dep - ΡÏθμιση εξαÏτήσεων χτισίματος για πακέτα πηγαίου κώδικα\n"
" dist-upgrade - Αναβάθμιση διανομής, δες το apt-get(8)\n"
-" dselect-upgrade - ΑκολοÏθηση των επιλογών του dselect\n"
+" dselect-upgrade - ΤήÏηση των επιλογών του dselect\n"
" clean - ΚαθαÏισμός των μεταφοÏτωμένων αÏχείων\n"
" autoclean - ΚαθαÏισμός παλαιότεÏα μεταφοÏτωμένων αÏχείων\n"
" check - ΕξακÏίβωση για τυχόν σπασμένες εξαÏτήσεις\n"
@@ -1385,19 +1434,19 @@ msgstr "ΣÏμπτυξη Διαθέσιμων ΠληÏοφοÏιών"
msgid "Failed to create pipes"
msgstr "Αποτυχία κατά τη δημιουÏγία διασωληνώσεων"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Αποτυχία κατά την εκτέλεση του gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "ΚατεστÏαμμένη αÏχειοθήκη"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Το Checksum του tar απέτυχε, η αÏχείοθήκη είναι κατεστÏαμμένη"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Άγνωστη επικεφαλίδα TAR Ï„Ïπος %u, μέλος %s"
@@ -1454,11 +1503,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Διπλό αÏχείο Ïυθμίσεων %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Αποτυχία εγγÏαφής στο αÏχείο %s"
+msgstr "Αποτυχία εγγÏαφής του αÏχείου %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Αποτυχία στο κλείσιμο του αÏχείου %s"
@@ -1511,7 +1560,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Το αÏχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "ΑδÏνατη η ανάγνωση του %s"
@@ -1541,9 +1591,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Οι φάκελοι info και temp Ï€Ïέπει να βÏίσκονται στο ίδιο σÏστημα αÏχείων"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
@@ -1557,7 +1607,7 @@ msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο Î
msgid "Internal error getting a package name"
msgstr "ΕσωτεÏικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Ανάγνωση Λίστας Πακέτων"
@@ -1601,13 +1651,8 @@ msgid "Internal error adding a diversion"
msgstr "ΕσωτεÏικό Σφάλμα στην Ï€Ïοσθήκη μιας παÏάκαμψης"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
-msgstr "Η cache πακέτων Ï€Ïέπει να αÏχικοποιηθεί Ï€Ïώτα"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Ανάγνωση Λιστών ΑÏχείων"
+msgstr "Η cache των πακέτων θα Ï€Ïέπει να Ï€Ïώτα να αÏχικοποιηθεί"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
@@ -1674,20 +1719,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Αδυναμία απόσυναÏμογής του CD-ROM στο %s, μποÏεί να είναι σε χÏήση."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Το αÏχείο Δε Î’Ïέθηκε"
+msgstr "Ο δίσκος δεν βÏέθηκε."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Το αÏχείο Δε Î’Ïέθηκε"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Αποτυχία εÏÏεσης της κατάστασης"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Αποτυχία οÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… χÏόνου Ï„Ïοποποίησης"
@@ -1815,7 +1859,7 @@ msgstr "Λήξη χÏόνου σÏνδεσης στην υποδοχή δεδοÎ
msgid "Unable to accept connection"
msgstr "ΑδÏνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ΠÏόβλημα κατά το hashing του αÏχείου"
@@ -1838,7 +1882,7 @@ msgstr "Αποτυχία κατά τη μεταφοÏά δεδομένων, ο Î
msgid "Query"
msgstr "ΕπεÏώτηση"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "ΑδÏνατη η εκτέλεση"
@@ -1867,75 +1911,78 @@ msgstr "ΑδÏνατη η αÏχικοποίηση της σÏνδεσης στÎ
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "ΑδÏνατη η σÏνδεση στο %s:%s (%s), λήξη χÏόνου σÏνδεσης"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "ΑδÏνατη η σÏνδεση στο %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "ΣÏνδεση στο %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "ΑδÏνατη η εÏÏεση του '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "ΠÏοσωÏινή αποτυχία στην εÏÏεση του '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Κάτι παÏάξενο συνέβη κατά την εÏÏεση του '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "ΑδÏνατη η σÏνδεση στο %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "ΑδÏνατη η εÏÏεση του '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "Ε: Λίστα ΟÏισμάτων από Acquire::gpgv::Options Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î·. Έξοδος."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"ΕσωτεÏικό σφάλμα: Η υπογÏαφή είναι καλή, αλλά αδυναμία Ï€ÏοσδιοÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… "
+"αποτυπώματος?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Î’Ïέθηκε τουλάχιστον μια μη έγκυÏη υπογÏαφή."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "ΑδÏνατο το κλείδωμα %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " για την επαλήθευση της υπογÏαφής (είναι εγκατεστημένο το gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθοÏν:"
+msgstr "Οι παÏακάτω υπογÏαφές ήταν μη έγκυÏες:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Οι παÏακάτω υπογÏαφές δεν ήταν δυνατόν να επαληθευτοÏν επειδή δεν ήταν "
+"διαθέσιμο το δημόσιο κλειδί:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1947,77 +1994,77 @@ msgstr "ΑδÏνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεÏγασία %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γÏαμμής επικεφαλίδας πάνω από %u χαÏακτήÏες"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ελαττωματική γÏαμμή επικεφαλίδας"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα απάντησης"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηÏίζει πλήÏως το range"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Άγνωστη μοÏφή ημεÏομηνίας"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Λήξη χÏόνου σÏνδεσης"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο εξόδου"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκÏο έκλεισε τη σÏνδεση"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Η σÏνδεση απέτυχε"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "ΕσωτεÏικό Σφάλμα"
@@ -2030,7 +2077,7 @@ msgstr "ΑδÏνατο η απεικόνιση mmap ενός άδειου αÏχ
msgid "Couldn't make mmap of %lu bytes"
msgstr "ΑδÏνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βÏέθηκε"
@@ -2153,7 +2200,7 @@ msgstr "Μη έγκυÏη λειτουÏγία %s"
msgid "Unable to stat the mount point %s"
msgstr "ΑδÏνατη η εÏÏεση της κατάστασης του σημείου επαφής %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "ΑδÏνατη η αλλαγή σε %s"
@@ -2301,74 +2348,89 @@ msgstr "Ï€ÏοαιÏετικό"
msgid "extra"
msgstr "επιπλέον"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Κατασκευή ΔένδÏου ΕξαÏτήσεων"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Υποψήφιες Εκδόσεις"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "ΠαÏαγωγή ΕξαÏτήσεων"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "ΣÏμπτυξη Διαθέσιμων ΠληÏοφοÏιών"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγÏαφής του αÏχείου %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γÏαμμή %u έχει υπεÏβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μοÏφή της γÏαμμής %u στη λίστα πηγών %s (Ï„Ïπος)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Ο Ï„Ïπος '%s' στη γÏαμμή %u στη λίστα πηγών %s είναι άγνωστος"
+msgstr "Ο Ï„Ïπος '%s' στη γÏαμμή %u στη λίστα πηγών %s είναι άγνωστος "
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Λάθος μοÏφή της γÏαμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
@@ -2390,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ο Ï„Ïπος αÏχείου ευÏετηÏίου '%s' δεν υποστηÏίζεται"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2398,7 +2460,7 @@ msgstr ""
"Το πακέτο '%s' χÏειάζεται να επανεγκατασταθεί, αλλά είναι αδÏνατη η εÏÏεση "
"κάποιας κατάλληλης αÏχείοθήκης."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2406,7 +2468,7 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παÏήγαγε διακοπές, αυτό ίσως "
"Ï€Ïοκλήθηκε από κÏατοÏμενα πακέτα."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "ΑδÏνατη η διόÏθωση Ï€Ïοβλημάτων, έχετε κÏατοÏμενα ελαττωματικά πακέτα."
@@ -2420,10 +2482,17 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται."
msgid "Archive directory %spartial is missing."
msgstr "Ο φάκελος αÏχειοθηκών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Κατέβασμα του αÏχείου %li του %li (απομένουν %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Ανάγνωση Λίστας Πακέτων"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2435,20 +2504,19 @@ msgstr "Ο οδηγός μεθόδου %s δεν μποÏεί να εντοπιÏ
msgid "Method %s did not start correctly"
msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Αλλαγή Μέσου: ΠαÏακαλώ εισάγετε το δίσκο με ετικέτα\n"
-" '%s'\n"
-"στη συσκευή '%s' και πιέστε enter\n"
+"ΠαÏακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σÏστημα συσκευασίας '%s' δεν υποστηÏίζεται"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "ΑδÏνατος ο καθοÏισμός ενός κατάλληλου Ï„Ïπου συστήματος πακέτων"
@@ -2485,85 +2553,85 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οÏιστεί Ï€ÏοτεÏαιότητα (ή έχει οÏιστεί μηδενική) για την καθήλωση"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Η cache έχει ασÏμβατο σÏστημα απόδοσης έκδοσης"
-#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (NewPackage)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (UsePackage1)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (UsePackage2)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (NewFileVer1)"
+msgstr "ΠÏοέκευψε σφάλμα κατά την επεξεÏγασία του %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (NewVersion1)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (UsePackage3)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (NewVersion2)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Εκπληκτικό, υπεÏβήκατε τον αÏιθμό των ονομάτων πακέτων που υποστηÏίζει το "
"APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Εκπληκτικό, υπεÏβήκατε τον αÏιθμό των εκδόσεων που υποστηÏίζει το APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Εκπληκτικό, υπεÏβήκατε τον αÏιθμό των εξαÏτήσεων που υποστηÏίζει το APT."
-#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (FindPkg)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Σφάλμα κατά την επεξεÏγασία του %s (CollectFileProvides)"
+msgstr "ΠÏοέκυψε σφάλμα κατά την επεξεÏγασία του %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Το πακέτο %s %s δε βÏέθηκε κατά την επεξεÏγασία εξαÏτήσεων του αÏχείου"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ΑδÏνατη η εÏÏεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Συλλογή ΠαÏοχών ΑÏχείου"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
@@ -2572,11 +2640,15 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2585,7 +2657,7 @@ msgstr ""
"ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο. (λόγω χαμένου αÏχείου)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2594,7 +2666,7 @@ msgstr ""
"ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2602,7 +2674,7 @@ msgstr ""
"ΚατεστÏαμμένα αÏχεία ευÏετηÏίου πακέτων. Δεν υπάÏχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2706,55 +2778,70 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγÏαφές με %i απώντα αÏχεία και %i ασÏμβατα αÏχεία\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Άνοιγμα του %s"
+msgstr "ΠÏοετοιμασία του %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Άνοιγμα του %s"
+msgstr "ΞεπακετάÏισμα του %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Άνοιγμα του αÏχείου Ïυθμίσεων %s"
+msgstr "ΠÏοετοιμασία ÏÏθμισης του %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "ΣÏνδεση στο %s"
+msgstr "ΡÏθμιση του %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Εγκατεστημένα: "
+msgstr "Εγκατέστησα το %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "ΠÏοετοιμασία για την αφαίÏεση του %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Άνοιγμα του %s"
+msgstr "ΑφαιÏÏŽ το %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Συστήνει"
+msgstr "ΑφαίÏεσα το %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "ΠÏοετοιμασία ÏÏθμισης του %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Αποτυχία διαγÏαφής του %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Η σÏνδεση έκλεισε Ï€ÏόωÏα"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Η ημεÏομηνία του αÏχείου %s έχει αλλάξει"
+
+#~ msgid "Reading file list"
+#~ msgstr "Ανάγνωση Λιστών ΑÏχείων"
+
+#~ msgid "Could not execute "
+#~ msgstr "ΑδÏνατη η εκτέλεση "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "ΠÏοετοιμασία για αφαίÏεση με ÏÏθμιση του %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "ΑφαίÏεσα με ÏÏθμιση το %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 284bd61eb..b2a265f7a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,13 +2,14 @@
# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
# Michael Piefel <piefel@informatik.hu-berlin.de>, 2002.
#
+#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
-"Last-Translator: Michael Piefel <piefel@debian.org>\n"
+"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,142 +18,142 @@ msgstr ""
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
+msgstr "Package %s version %s has an unmet dep:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr ""
+msgstr "Unable to locate package %s"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr ""
+msgstr "Total package names : "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
-msgstr ""
+msgstr " Normal packages: "
#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
-msgstr ""
+msgstr " Pure virtual packages: "
#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
-msgstr ""
+msgstr " Single virtual packages: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
-msgstr ""
+msgstr " Mixed virtual packages: "
#: cmdline/apt-cache.cc:276
msgid " Missing: "
-msgstr ""
+msgstr " Missing: "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr ""
+msgstr "Total distinct versions: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr ""
+msgstr "Total dependencies: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr ""
+msgstr "Total ver/file relations: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Total Provides mappings: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr ""
+msgstr "Total globbed strings: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr ""
+msgstr "Total dependency version space: "
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr ""
+msgstr "Total slack space: "
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr ""
+msgstr "Total space accounted for: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr ""
+msgstr "Package file %s is out of sync."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr ""
+msgstr "You must give exactly one pattern"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr ""
+msgstr "No packages found"
#: cmdline/apt-cache.cc:1462
msgid "Package files:"
-msgstr ""
+msgstr "Package files:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
+msgstr "Cache is out of sync, can't x-ref a package file"
#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
-msgstr ""
+msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
-msgstr ""
+msgstr "Pinned packages:"
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
-msgstr ""
+msgstr "(not found)"
#. Installed version
#: cmdline/apt-cache.cc:1515
msgid " Installed: "
-msgstr ""
+msgstr " Installed: "
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
-msgstr ""
+msgstr "(none)"
#. Candidate Version
#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
-msgstr ""
+msgstr " Candidate: "
#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
-msgstr ""
+msgstr " Package pin: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
msgid " Version table:"
-msgstr ""
+msgstr " Version table:"
#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
-msgstr ""
+msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s for %s %s compiled on %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -190,10 +191,57 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Please insert a Disc in the drive and press enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repeat this process for the rest of the CDs in your set."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr ""
+msgstr "Arguments not in pairs"
#: cmdline/apt-config.cc:76
msgid ""
@@ -210,11 +258,23 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr ""
+msgstr "%s not a valid DEB package."
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -229,44 +289,51 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
-msgstr ""
+msgstr "Unable to write to %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
+msgstr "Cannot get debconf version. Is debconf installed?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
-#, fuzzy
msgid "Package extension list is too long"
-msgstr "Option ‘%s’ is too long"
+msgstr "Package extension list is too long"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
#, c-format
msgid "Error processing directory %s"
-msgstr ""
+msgstr "Error processing directory %s"
#: ftparchive/apt-ftparchive.cc:254
-#, fuzzy
msgid "Source extension list is too long"
-msgstr "Option ‘%s’ is too long"
+msgstr "Source extension list is too long"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr ""
+msgstr "Error writing header to contents file"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr ""
+msgstr "Error processing contents %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -311,6 +378,7 @@ msgstr ""
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" sources srcpath [overridefile [pathprefix]]\n"
" contents path\n"
+" release path\n"
" generate config [groups]\n"
" clean config\n"
"\n"
@@ -326,7 +394,7 @@ msgstr ""
"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
"The --source-override option can be used to specify a src override file\n"
"\n"
-"The ‘packages’ and ‘sources’ command should be run in the root of the\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
"tree. BinaryPath should point to the base of the recursive search and \n"
"override file should contain the override flags. Pathprefix is\n"
"appended to the filename fields if present. Example usage from the \n"
@@ -347,433 +415,446 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr ""
+msgstr "No selections matched"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Some files are missing in the package file group ‘%s’"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr ""
+msgstr "DB was corrupted, file renamed to %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
+msgstr "DB is old, attempting to upgrade %s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:73
-#, fuzzy, c-format
+#: ftparchive/cachedb.cc:81
+#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Unable to fetch file, server said ‘%s’"
+msgstr "Unable to open DB file %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr ""
+msgid "Failed to stat %s"
+msgstr "Failed to stat %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr ""
+msgstr "Archive has no control record"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
-msgstr ""
+msgstr "Unable to get a cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr ""
+msgstr "W: Unable to read directory %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr ""
+msgstr "W: Unable to stat %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
-msgstr ""
+msgstr "E:"
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
-msgstr ""
+msgstr "W:"
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
-msgstr ""
+msgstr "E: Errors apply to file "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
-#, fuzzy, c-format
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#, c-format
msgid "Failed to resolve %s"
msgstr "Could not resolve ‘%s’"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
-msgstr ""
+msgstr "Tree walking failed"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
-msgstr ""
+msgstr "Failed to open %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr ""
+msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
-msgstr ""
+msgstr "Failed to readlink %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
-msgstr ""
+msgstr "Failed to unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr ""
+msgstr "*** Failed to link %s to %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
+msgstr " DeLink limit of %sB hit.\n"
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
-msgstr ""
+msgstr "Archive had no package field"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
-msgstr ""
+msgstr " %s has no override entry\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr ""
+msgstr " %s maintainer is %s not %s\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s has no override entry\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s has no override entry\n"
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr ""
+msgstr "Internal error, could not locate member %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr ""
+msgstr "realloc - Failed to allocate memory"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
msgid "Unable to open %s"
-msgstr ""
+msgstr "Unable to open %s"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr ""
+msgstr "Malformed override %s line %lu #1"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr ""
+msgstr "Malformed override %s line %lu #2"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr ""
+msgstr "Malformed override %s line %lu #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr ""
+msgstr "Failed to read the override file %s"
#: ftparchive/multicompress.cc:75
-#, fuzzy, c-format
+#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Unknown Compression Algorithm ‘%s’"
+msgstr "Unknown compression algorithm ‘%s’"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr ""
+msgstr "Compressed output %s needs a compression set"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
+msgstr "Failed to create IPC pipe to subprocess"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr ""
+msgstr "Failed to create FILE*"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr ""
+msgstr "Failed to fork"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr ""
+msgstr "Compress child"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr ""
+msgstr "Internal error, failed to create %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr ""
+msgstr "Failed to create subprocess IPC"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr ""
+msgstr "Failed to exec compressor"
#: ftparchive/multicompress.cc:363
msgid "decompressor"
-msgstr ""
+msgstr "decompressor"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr ""
+msgstr "IO to subprocess/file failed"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr ""
+msgstr "Failed to read while computing MD5"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr ""
+msgstr "Problem unlinking %s"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr ""
+msgstr "Failed to rename %s to %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
-msgstr ""
+msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
-msgstr ""
+msgstr "Regex compilation error - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
-msgstr ""
+msgstr "The following packages have unmet dependencies."
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
-msgstr ""
+msgstr "but %s is installed"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
-msgstr ""
+msgstr "but %s is to be installed"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
-msgstr ""
+msgstr "but it is not installable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
-msgstr ""
+msgstr "but it is a virtual package"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr ""
+msgstr "but it is not installed"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
-msgstr ""
+msgstr "but it is not going to be installed"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
-msgstr ""
+msgstr "or"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr ""
+msgstr "The following NEW packages will be installed"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr ""
+msgstr "The following packages will be REMOVED"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr ""
+msgstr "The following packages have been kept back:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr ""
+msgstr "The following packages will be upgraded:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgstr "The following packages will be DOWNGRADED:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
-msgstr ""
+msgstr "The following held packages will be changed:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
-msgstr ""
+msgstr "%s (due to %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
+msgstr "%lu upgraded, %lu newly installed, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
-msgstr ""
+msgstr "%lu reinstalled, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
-msgstr ""
+msgstr "%lu downgraded, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
+msgstr "%lu to remove and %lu not upgraded.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr ""
+msgstr "%lu not fully installed or removed.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
-msgstr ""
+msgstr "Correcting dependencies..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
-msgstr ""
+msgstr " failed."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
-msgstr ""
+msgstr "Unable to correct dependencies"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
-msgstr ""
+msgstr "Unable to minimize the upgrade set"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
-msgstr ""
+msgstr "Done"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "You might want to run ‘apt-get -f install’ to correct these."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
-msgstr ""
+msgstr "Unmet dependencies. Try using -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
+msgstr "WARNING: The following packages cannot be authenticated!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Authentication warning overridden.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr ""
+msgstr "Install these packages without verification [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "Some packages could not be authenticated"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
-msgstr ""
+msgstr "There are problems and -y was used without --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Internal error, InstallPackages was called with broken packages!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
+msgstr "Packages need to be removed but remove is disabled."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr ""
+msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
-msgstr ""
+msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
-msgstr ""
+msgstr "The list of sources could not be read."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
+msgstr "Need to get %sB/%sB of archives.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr ""
+msgstr "Need to get %sB of archives.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "After unpacking %sB of additional disk space will be used.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr ""
+msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr ""
+msgstr "Couldn't determine free space in %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr ""
+msgstr "You don't have enough free space in %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
+msgstr "Trivial Only specified but this is not a trivial operation."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
-msgstr ""
+msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
@@ -783,148 +864,174 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
-msgstr ""
+msgstr "Abort."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
-msgstr ""
+msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr ""
+msgstr "Failed to fetch %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
-msgstr ""
+msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
-msgstr ""
+msgstr "Download complete and in download only mode"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
+msgstr "--fix-missing and media swapping is not currently supported"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
-msgstr ""
+msgstr "Unable to correct missing packages."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
-msgstr ""
+msgstr "Aborting install."
-#: cmdline/apt-get.cc:1028
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1031
+#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr ""
+msgstr "Package %s is not installed, so not removed\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
+msgstr "Package %s is a virtual package provided by:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
-msgstr ""
+msgstr " [Installed]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr ""
+msgstr "You should explicitly select one to install."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
-msgstr ""
+msgstr "However the following packages replace it:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
-msgstr ""
+msgstr "Package %s has no installation candidate"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
+msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
-msgstr ""
+msgstr "%s is already the newest version.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr ""
+msgstr "Selected version %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
-msgstr ""
+msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
-msgstr ""
+msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
-#: cmdline/apt-get.cc:1374
-msgid "Internal error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "The following information may help to resolve the situation:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Internal error, problem resolver broke stuff"
+
+#: cmdline/apt-get.cc:1463
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Internal error, AllUpgrade broke stuff"
+
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
-msgstr ""
+msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run ‘apt-get -f install’ to correct these:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -932,166 +1039,179 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
-msgstr ""
+msgstr "Broken packages"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr ""
+msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
-msgstr ""
+msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
-msgstr ""
+msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Calculating upgrade..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr ""
+msgstr "Failed"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
-msgstr ""
+msgstr "Done"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
-msgstr ""
+msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
-msgstr ""
+msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping unpack of already unpacked source in %s\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
-msgstr ""
+msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
+msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr ""
+msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
-msgstr ""
+msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
+msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
-msgstr ""
+msgstr "Child process failed"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
-msgstr ""
+msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr ""
+msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
-msgstr ""
+msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
+"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
+msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
+msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
-msgstr ""
+msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
-msgstr ""
+msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1132,35 +1252,73 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr ""
+msgstr "Hit "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr ""
+msgstr "Get: "
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr ""
+msgstr "Ign "
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr ""
+msgstr "Err"
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Fetched %sB in %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr ""
+msgstr " [Working]"
#: cmdline/acqprogress.cc:271
-#, fuzzy, c-format
+#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
" '%s'\n"
@@ -1172,7 +1330,7 @@ msgstr ""
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr ""
+msgstr "Unknown package record!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1187,216 +1345,228 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr ""
+msgstr "Bad default setting!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
msgid "Press enter to continue."
-msgstr ""
+msgstr "Press enter to continue."
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr ""
+msgstr "Some errors occurred while unpacking. I'm going to configure the"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr ""
+msgstr "packages that were installed. This may result in duplicate errors"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
+msgstr "or errors caused by missing dependencies. This is OK, only the errors"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
+"above this message are important. Please fix them and run [I]nstall again"
#: dselect/update:30
msgid "Merging available information"
-msgstr ""
+msgstr "Merging available information"
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr ""
+msgstr "Failed to create pipes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
-msgstr ""
+msgstr "Failed to exec gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
-msgstr ""
+msgstr "Corrupted archive"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
-msgstr ""
+msgstr "Tar checksum failed, archive corrupted"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr ""
+msgstr "Unknown TAR header type %u, member %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr ""
+msgstr "Invalid archive signature"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr ""
+msgstr "Error reading archive member header"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr ""
+msgstr "Invalid archive member header"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
-msgstr ""
+msgstr "Archive is too short"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr ""
+msgstr "Failed to read the archive headers"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr ""
+msgstr "DropNode called on still linked node"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr ""
+msgstr "Failed to locate the hash element!"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr ""
+msgstr "Failed to allocate diversion"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
-msgstr ""
+msgstr "Internal error in AddDiversion"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s"
#: apt-inst/filelist.cc:510
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr ""
+msgstr "Double add of diversion %s -> %s"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr ""
+msgstr "Duplicate conf file %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Could not resolve ‘%s’"
+msgstr "Failed to write file ‘%s’"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr ""
+msgstr "Failed to close file %s"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
-msgstr ""
+msgstr "The path %s is too long"
#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr ""
+msgstr "Unpacking %s more than once"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr ""
+msgstr "The directory %s is diverted"
#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
+msgstr "The package is trying to write to the diversion target %s/%s"
#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
-msgstr ""
+msgstr "The diversion path is too long"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
+msgstr "The directory %s is being replaced by a non-directory"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr ""
+msgstr "Failed to locate node in its hash bucket"
#: apt-inst/extract.cc:287
msgid "The path is too long"
-msgstr ""
+msgstr "The path is too long"
#: apt-inst/extract.cc:417
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr ""
+msgstr "Overwrite package match with no version for %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
+msgstr "File %s/%s overwrites the one in the package %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
-msgstr ""
+msgstr "Unable to read %s"
#: apt-inst/extract.cc:494
#, c-format
msgid "Unable to stat %s"
-msgstr ""
+msgstr "Unable to stat %s"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
-msgstr ""
+msgstr "Failed to remove %s"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
-msgstr ""
+msgstr "Unable to create %s"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr ""
+msgstr "Failed to stat %sinfo"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
-msgstr ""
+msgstr "The info and temp directories need to be on the same filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
-msgstr ""
+msgstr "Reading package lists"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr ""
+msgstr "Failed to change to the admin dir %sinfo"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
-msgstr ""
+msgstr "Internal error getting a package name"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
-msgstr ""
+msgstr "Reading file listing"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1412,53 +1582,49 @@ msgstr ""
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr ""
+msgstr "Failed reading the list file %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
-msgstr ""
+msgstr "Internal error getting a node"
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
+msgstr "Failed to open the diversions file %sdiversions"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr ""
+msgstr "The diversion file is corrupted"
#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr ""
+msgstr "Invalid line in the diversion file: %s"
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
-msgstr ""
+msgstr "Internal error adding a diversion"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
+msgstr "The pkg cache must be initialized first"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
+msgstr "Failed to find a Package: header, offset %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
+msgstr "Bad ConfFile section in the status file. Offset %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr ""
+msgstr "Error parsing MD5. Offset %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
@@ -1466,101 +1632,105 @@ msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "This is not a valid DEB archive, missing ‘%s’ member"
#: apt-inst/deb/debfile.cc:52
-#, fuzzy, c-format
+#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "This is not a valid DEB archive, missing ‘%s’ member"
+msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member"
#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
-msgstr ""
+msgstr "Couldn't change to %s"
#: apt-inst/deb/debfile.cc:138
msgid "Internal error, could not locate member"
-msgstr ""
+msgstr "Internal error, could not locate member"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr ""
+msgstr "Failed to locate a valid control file"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr ""
+msgstr "Unparsable control file"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr ""
+msgstr "Unable to read the cdrom database %s"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "Wrong CD-ROM"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
+msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
#: methods/cdrom.cc:169
msgid "Disk not found."
-msgstr ""
+msgstr "Disk not found."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr ""
+msgstr "File not found"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
-msgstr ""
+msgstr "Failed to stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr ""
+msgstr "Failed to set modification time"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
+msgstr "Invalid URI, local URIS must not start with //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr ""
+msgstr "Logging in"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr ""
+msgstr "Unable to determine the peer name"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
-msgstr ""
+msgstr "Unable to determine the local name"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "The server refused the connection and said: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr ""
+msgstr "USER failed, server said: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr ""
+msgstr "PASS failed, server said: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
#: methods/ftp.cc:265
#, c-format
@@ -1570,85 +1740,85 @@ msgstr "Login script command ‘%s’ failed, server said: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr ""
+msgstr "TYPE failed, server said: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr ""
+msgstr "Connection timeout"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr ""
+msgstr "Server closed the connection"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
-msgstr ""
+msgstr "Read error"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr ""
+msgstr "A response overflowed the buffer."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr ""
+msgstr "Protocol corruption"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
-msgstr ""
+msgstr "Write error"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr ""
+msgstr "could not create a socket"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
+msgstr "Could not connect data socket, connection timed out"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Could not connect, passive socket."
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
+msgstr "getaddrinfo was unable to get a listening socket"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
-msgstr ""
+msgstr "Could not bind a socket"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr ""
+msgstr "Could not listen on the socket"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr ""
+msgstr "Could not determine the name of the socket"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
-msgstr ""
+msgstr "Unable to send PORT command"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr ""
+msgstr "Unknown address family %u (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr ""
+msgstr "EPRT failed, server said: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr ""
+msgstr "Data socket connect timed out"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
-msgstr ""
+msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr ""
+msgstr "Problem hashing file"
#: methods/ftp.cc:877
#, c-format
@@ -1657,7 +1827,7 @@ msgstr "Unable to fetch file, server said ‘%s’"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr ""
+msgstr "Data socket timed out"
#: methods/ftp.cc:922
#, c-format
@@ -1667,202 +1837,205 @@ msgstr "Data transfer failed, server said ‘%s’"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr ""
+msgstr "Query"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
-msgstr ""
+msgstr "Unable to invoke"
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr ""
+msgstr "Connecting to %s (%s)"
#: methods/connect.cc:71
#, c-format
msgid "[IP: %s %s]"
-msgstr ""
+msgstr "[IP: %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
+msgstr "Cannot initiate the connection to %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
+msgstr "Could not connect to %s:%s (%s), connection timed out"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr ""
+msgstr "Could not connect to %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr ""
+msgstr "Connecting to %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Could not resolve ‘%s’"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporary failure resolving ‘%s’"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr ""
+msgstr "Unable to connect to %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Could not resolve ‘%s’"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "At least one invalid signature was encountered."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Could not resolve ‘%s’"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " to verify signature (is gnupg installed?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr ""
+msgstr "Couldn't open pipe for %s"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr ""
+msgstr "Read error from %s process"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr ""
+msgstr "Waiting for headers"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr ""
+msgstr "Got a single header line over %u chars"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr ""
+msgstr "Bad header line"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "This HTTP server has broken range support"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
-msgstr ""
+msgstr "Unknown date format"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
-msgstr ""
+msgstr "Select failed"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
-msgstr ""
+msgstr "Connection timed out"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr ""
+msgstr "Error writing to output file"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr ""
+msgstr "Error writing to file"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr ""
+msgstr "Error writing to the file"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
-msgstr ""
+msgstr "Error reading from server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr ""
+msgstr "Bad header data"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr ""
+msgstr "Connection failed"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
-msgstr ""
+msgstr "Internal error"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr ""
+msgstr "Cannot mmap an empty file"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+msgstr "Couldn't make mmap of %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr ""
+msgstr "Selection %s not found"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
@@ -1872,42 +2045,42 @@ msgstr "Unrecognized type abbreviation: ‘%c’"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr ""
+msgstr "Opening configuration file %s"
#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
-msgstr ""
+msgstr "Line %d too long (max %d)"
#: apt-pkg/contrib/configuration.cc:608
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
+msgstr "Syntax error %s:%u: Block starts with no name."
#: apt-pkg/contrib/configuration.cc:627
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
+msgstr "Syntax error %s:%u: Malformed tag"
#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
+msgstr "Syntax error %s:%u: Extra junk after value"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
+msgstr "Syntax error %s:%u: Directives can only be done at the top level"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
+msgstr "Syntax error %s:%u: Too many nested includes"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr ""
+msgstr "Syntax error %s:%u: Included from here"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
@@ -1917,17 +2090,17 @@ msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
+msgstr "Syntax error %s:%u: Extra junk at end of file"
#: apt-pkg/contrib/progress.cc:154
#, c-format
msgid "%c%s... Error!"
-msgstr ""
+msgstr "%c%s... Error!"
#: apt-pkg/contrib/progress.cc:156
#, c-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Done"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
@@ -1938,22 +2111,22 @@ msgstr "Command line option ‘%c’ [from %s] is not known."
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr ""
+msgstr "Command line option %s is not understood"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr ""
+msgstr "Command line option %s is not boolean"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr ""
+msgstr "Option %s requires an argument."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
+msgstr "Option %s: Configuration item specification must have an =<val>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -1968,234 +2141,249 @@ msgstr "Option ‘%s’ is too long"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr ""
+msgstr "Sense %s is not understood, try true or false."
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
msgid "Invalid operation %s"
-msgstr ""
+msgstr "Invalid operation %s"
#: apt-pkg/contrib/cdromutl.cc:55
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr ""
+msgstr "Unable to stat the mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr ""
+msgstr "Unable to change to %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr ""
+msgstr "Failed to stat the cdrom"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr ""
+msgstr "Not using locking for read only lock file %s"
#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
-msgstr ""
+msgstr "Could not open lock file %s"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
+msgstr "Not using locking for nfs mounted lock file %s"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
-msgstr ""
+msgstr "Could not get lock %s"
#: apt-pkg/contrib/fileutl.cc:377
-#, fuzzy, c-format
+#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Waited for %s but it wasn't there"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr ""
+msgstr "Sub-process %s received a segmentation fault."
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
+msgstr "Sub-process %s returned an error code (%u)"
#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr ""
+msgstr "Sub-process %s exited unexpectedly"
#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
-msgstr ""
+msgstr "Could not open file %s"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr ""
+msgstr "read, still have %lu to read but none left"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr ""
+msgstr "write, still have %lu to write but couldn't"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr ""
+msgstr "Problem closing the file"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr ""
+msgstr "Problem unlinking the file"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr ""
+msgstr "Problem syncing the file"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr ""
+msgstr "Empty package cache"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr ""
+msgstr "The package cache file is corrupted"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr ""
+msgstr "The package cache file is an incompatible version"
#: apt-pkg/pkgcache.cc:142
-#, fuzzy, c-format
+#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "This APT does not support the Versioning System ‘%s’"
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr ""
+msgstr "The package cache was built for a different architecture"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
-msgstr ""
+msgstr "Depends"
#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
-msgstr ""
+msgstr "PreDepends"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr ""
+msgstr "Suggests"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
-msgstr ""
+msgstr "Recommends"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr ""
+msgstr "Conflicts"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
-msgstr ""
+msgstr "Replaces"
#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
-msgstr ""
+msgstr "Obsoletes"
#: apt-pkg/pkgcache.cc:231
msgid "important"
-msgstr ""
+msgstr "important"
#: apt-pkg/pkgcache.cc:231
msgid "required"
-msgstr ""
+msgstr "required"
#: apt-pkg/pkgcache.cc:231
msgid "standard"
-msgstr ""
+msgstr "standard"
#: apt-pkg/pkgcache.cc:232
msgid "optional"
-msgstr ""
+msgstr "optional"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
-msgstr ""
+msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
-msgstr ""
+msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
-msgstr ""
+msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
-msgstr ""
+msgstr "Dependency generation"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Merging available information"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Failed to open %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Failed to write file ‘%s’"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Unable to parse package file %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr ""
+msgstr "Unable to parse package file %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
-msgstr ""
+msgstr "Opening %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
-msgstr ""
+msgstr "Line %u too long in source list %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr ""
+msgstr "Malformed line %u in source list %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, fuzzy, c-format
+#: apt-pkg/sourcelist.cc:244
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Type ‘%s’ is not known in on line %u in source list %s"
+msgstr "Type ‘%s’ is not known on line %u in source list %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
+msgstr "Malformed line %u in source list %s (vendor id)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2204,74 +2392,85 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Index file type ‘%s’ is not supported"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
+msgstr "Unable to correct problems, you have held broken packages."
#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr ""
+msgstr "Lists directory %spartial is missing."
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr ""
+msgstr "Archive directory %spartial is missing."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Downloading file %li of %li (%s remaining)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Reading file listing"
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
-msgstr ""
+msgstr "The method driver %s could not be found."
#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
-msgstr ""
+msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Media Change: Please insert the disc labelled\n"
-" ‘%s’\n"
-"in the drive ‘%s’ and press enter\n"
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Packaging system ‘%s’ is not supported"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+msgstr "Unable to determine a suitable packaging system type"
#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
-msgstr ""
+msgstr "Unable to stat %s."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
@@ -2279,141 +2478,150 @@ msgstr "You must put some ‘source’ URIs in your sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
+msgstr "The package lists or status file could not be parsed or opened."
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
+msgstr "You may want to run apt-get update to correct these problems"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
-msgstr ""
+msgstr "Invalid record in the preferences file, no Package header"
#: apt-pkg/policy.cc:291
#, c-format
msgid "Did not understand pin type %s"
-msgstr ""
+msgstr "Did not understand pin type %s"
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
-msgstr ""
+msgstr "No priority (or zero) specified for pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
-msgstr ""
+msgstr "Cache has an incompatible versioning system"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of package names this APT can handle.."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of versions this APT can handle."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of dependencies this APT can handle."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
+msgstr "Error occurred while processing %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
+msgstr "Error occurred while processing %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
+msgstr "Package %s %s was not found while processing file dependencies"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr ""
+msgstr "Couldn't stat source package list %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
-msgstr ""
+msgstr "Collecting File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
-msgstr ""
+msgstr "IO Error saving source cache"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr ""
+msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
+msgstr "MD5Sum mismatch"
+
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
+"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
-msgstr ""
+msgstr "Size mismatch"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgstr "Vendor block %s contains no fingerprint"
#: apt-pkg/cdrom.cc:507
#, c-format
@@ -2421,46 +2629,48 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
-msgstr ""
+msgstr "Identifying.. "
#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
-msgstr ""
+msgstr "Stored label: %s \n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgstr "Using CD-ROM mount point %s\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgstr "Unmounting CD-ROM\n"
#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
-msgstr ""
+msgstr "Waiting for disc...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgstr "Mounting CD-ROM...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr ""
+msgstr "Scanning disc for index files..\n"
#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
-msgstr ""
+msgstr "Found %i package indexes, %i source indexes and %i signatures\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr ""
+msgstr "That is not a valid name, try again.\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2468,96 +2678,113 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
+"This disc is called: \n"
+"'%s'\n"
#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
-msgstr ""
+msgstr "Copying package lists..."
#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
-msgstr ""
+msgstr "Writing new source list\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "Source list entries for this disc are:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
-msgstr ""
+msgstr "Unmounting CD-ROM..."
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Wrote %i records.\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Wrote %i records with %i missing files.\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Wrote %i records with %i mismatched files\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Preparing %s"
-msgstr ""
+msgstr "Preparing %s"
#: apt-pkg/deb/dpkgpm.cc:359
#, c-format
msgid "Unpacking %s"
-msgstr ""
+msgstr "Unpacking %s"
#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Preparing to configure %s"
#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Configuring %s"
-msgstr ""
+msgstr "Configuring %s"
#: apt-pkg/deb/dpkgpm.cc:366
#, c-format
msgid "Installed %s"
-msgstr ""
+msgstr "Installed %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparing for removal of %s"
#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removing %s"
-msgstr ""
+msgstr "Removing %s"
#: apt-pkg/deb/dpkgpm.cc:373
#, c-format
msgid "Removed %s"
-msgstr ""
+msgstr "Removed %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparing to configure %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Failed to remove %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr ""
+msgstr "Connection closed prematurely"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "File date has changed %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Reading file list"
+
+#~ msgid "Could not execute "
+#~ msgstr "Could not execute "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparing for remove with config %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removed with config %s"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
@@ -2580,9 +2807,6 @@ msgstr ""
#~ msgid "-> '"
#~ msgstr "-> ‘"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’"
-
#~ msgid " '"
#~ msgstr " ‘"
diff --git a/po/es.po b/po/es.po
index ac836377a..252206767 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,10 +6,10 @@
# Rubén Porras Campo <nahoo@inicia.es> 2004
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.24\n"
+"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-08 20:36+0100\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2005-11-16 17:37+0100\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -149,14 +149,14 @@ msgstr " Tabla de versión:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -232,6 +232,19 @@ msgstr ""
"cache=/tmp\n"
"Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Por favor inserte un disco en la unidad y presione Intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repita este proceso para el resto de los CDs del conjunto."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumentos no emparejados"
@@ -295,7 +308,7 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
@@ -329,7 +342,6 @@ msgid "Error processing contents %s"
msgstr "Error procesando contenidos %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -371,12 +383,12 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
"Uso: apt-ftparchive [opciones] orden\n"
-"Comandos: packages trayectoria-binaria [archivo-sobrepaso\n"
-" [prefijo-trayectoria]]\n"
-" sources trayectoria-fuente [archivo-sobrepaso \n"
-" [prefijo-trayectoria]]\n"
-" contents trayectoria\n"
-" release trayectoria\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
+" [prefijo-ruta]]\n"
+" sources ruta-fuente [archivo-predominio \n"
+" [prefijo-ruta]]\n"
+" contents ruta\n"
+" release ruta\n"
" generate config [grupos]\n"
" clean config\n"
"\n"
@@ -386,7 +398,7 @@ msgstr ""
"\n"
"apt-ftparchive genera ficheros Package de un árbol de .debs. El fichero\n"
"Package contiene los contenidos de todos los campos de control de cada\n"
-"paquete al igual que la suma MD5 y el tamaño del archivo. Se soporta\n"
+"paquete al igual que la suma MD5 y el tamaño del archivo. Se puede usar\n"
"un archivo de predominio para forzar el valor de Priority y\n"
"Section.\n"
"\n"
@@ -394,7 +406,7 @@ msgstr ""
".dscs. Se puede utilizar la opción --source-override para especificar un\n"
"fichero de predominio de fuente.\n"
"\n"
-"Las órdenes 'packages' y 'sources' deben ejecutarse en la raíz del\n"
+"Las órdenes «packages» y «sources» deben ejecutarse en la raíz del\n"
"árbol. BinaryPath debe apuntar a la base de la búsqueda\n"
"recursiva, y el archivo de predominio debe de contener banderas de\n"
"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
@@ -410,7 +422,7 @@ msgstr ""
" -q Silencioso\n"
" -d=? Selecciona la base de datos de caché opcional \n"
" --no-delink Habilita modo de depuración delink\n"
-" --contents Generación del contenido del archivo 'Control'\n"
+" --contents Generación del contenido del archivo «Control»\n"
" -c=? Lee este archivo de configuración\n"
" -o=? Establece una opción de configuración arbitraria"
@@ -423,115 +435,126 @@ msgstr "Ninguna selección coincide"
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:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "BD corrompida, archivo renombrado a %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB anticuada, intentando actualizar %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "No se pudo abrir el archivo DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Cambió la fecha del archivo %s"
+msgid "Failed to stat %s"
+msgstr "No pude leer %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "No hay registro de control del archivo"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No se pudo leer directorio %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No se pudo leer %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al archivo '"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "No se pudo resolver %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Falló el recorrido por el árbol."
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "No se pudo abrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "No se pudo leer el enlace %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "No se pudo desligar %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No pude enlazar %s con %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "No pude leer %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s no tiene entrada de predominio\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s no tiene entrada de predominio\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -627,259 +650,258 @@ msgstr "Hay problemas desligando %s"
msgid "Failed to rename %s to %s"
msgstr "Falló el renombre de %s a %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "pero no está instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARÁN:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Se cambiarán los siguientes paquetes retenidos:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVISO: Se van a eliminar los siguientes paquetes esenciales\n"
-"¡Esto NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
+"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
+"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarán, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigiendo dependencias..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " falló."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "No se puede corregir las dependencias"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "No se puede minimizar el conjunto de actualización"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Listo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticación ignorado.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "¿Instalar estos paquetes sin verificación [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Algunos paquetes no se pueden autenticar"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Hay problemas y se utilizó -y sin --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error interno, InstallPackages fue llamado con un paquete roto!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no terminó el ordenamiento"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que raro.. Los tamaños no concuerdan, mande un correo a \n"
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Se necesita descargar %sB/%sB de archivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Necesito descargar %sB de archivos.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarán %sB después de desempaquetar.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sí, ¡haga lo que le digo!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
"Está a punto de hacer algo potencialmente dañino\n"
-"Para continuar escriba la frase '%s'\n"
+"Para continuar escriba la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "¿Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de sólo descarga"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -887,47 +909,47 @@ msgstr ""
"No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n"
"apt-get update o deba intentarlo de nuevo con --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "No se pudieron corregir los paquetes que faltan."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando la instalación."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s en lugar de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquete %s no esta instalado, no se eliminará\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquete %s es un paquete virtual provisto por:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Necesita seleccionar explícitamente uno para instalar."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -938,49 +960,49 @@ msgstr ""
"a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
"encuentra disponible desde alguna otra fuente\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquete %s no tiene candidato para su instalación"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ya está en su versión más reciente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontró la Distribución '%s' para '%s'"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontró la versión '%s' para '%s'"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versión seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "El comando de actualización no toma argumentos"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -988,25 +1010,46 @@ msgstr ""
"Algunos archivos de índice no se han podido descargar, se han ignorado,\n"
"o se ha utilizado unos antiguos en su lugar."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente información puede ayudar a resolver la situación:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Error interno, el sistema de solución de problemas rompió\n"
+"algunas cosas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompió cosas"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1057,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solución)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1026,7 +1069,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1036,118 +1079,119 @@ msgstr ""
"paquete simplemente no sea instalable y debería de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente información puede ayudar a resolver la situación:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Se instalarán los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falló"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solución de problemas rompió\n"
"algunas cosas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción '%s'.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construcción"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1156,7 +1200,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1165,32 +1209,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
"disponible del paquete %s satisface los requisitos de versión"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1378,19 +1422,19 @@ msgstr "Fusionando información disponible"
msgid "Failed to create pipes"
msgstr "No pude crear las tuberías"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "No pude ejecutar gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Archivo corrompido"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "No se aprobó la suma de control del tar, archive corrompido"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
@@ -1447,11 +1491,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Archivo de configuración duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Falló el cierre del archivo %s"
+msgstr "Falló la escritura del archivo %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "No pude cerrar el archivo %s"
@@ -1504,7 +1548,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -1535,9 +1580,9 @@ msgstr ""
"Los directorios info y temp deben de estar en el mismo sistema de archivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Leyendo lista de paquetes"
@@ -1551,7 +1596,7 @@ msgstr "No pude cambiarme al directorio de administración %sinfo"
msgid "Internal error getting a package name"
msgstr "Error interno obteniendo un Nombre de Paquete"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Leyendo Listado de Archivos"
@@ -1598,10 +1643,6 @@ msgstr "Error interno agregando una desviación"
msgid "The pkg cache must be initialized first"
msgstr "El caché del paquete debe de inicializarse primero"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Leyendo Lista de Archivos"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1667,20 +1708,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fichero no encontrado"
+msgstr "Disco no encontrado."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichero no encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -1808,7 +1848,7 @@ msgstr "Expiró conexión a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexión"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1831,7 +1871,7 @@ msgstr "Falló transferencia de datos, el servidor dijo '%s'"
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "No pude invocar "
@@ -1860,75 +1900,78 @@ msgstr "No puedo iniciar la conexión a %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No pude conectarme a %s:%s (%s), expiró tiempo para conexión"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No pude conectarme a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "No pude resolver '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal al resolver '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Algo raro pasó resolviendo '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "No pude conectarme a %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "No pude resolver '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Se encontró al menos una firma inválida."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "No se pudo bloquear %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " para verificar la firma (¿está instalado gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Se instalarán los siguientes paquetes extras:"
+msgstr "Las siguientes firms fueron inválidas:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Las firmas siguientes no se pudieron verificar porque su llave pública no "
+"está disponible:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1940,76 +1983,76 @@ msgstr "No pude abrir una tubería para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mala línea de cabecera"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envió una cabecera de respuesta inválida"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envió una cabecera de Content-Length inválida"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envió una cabecera de Content-Range inválida"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Éste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Falló la selección"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Expiró la conexión"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Fallo la conexión"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Error interno"
@@ -2022,7 +2065,7 @@ msgstr "No puedo hacer mmap de un fichero vacío"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selección %s no encontrada"
@@ -2147,7 +2190,7 @@ msgstr "Operación inválida: %s"
msgid "Unable to stat the mount point %s"
msgstr "No se puede obtener información del punto de montaje %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "No se pudo cambiar a %s"
@@ -2292,74 +2335,89 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Creando árbol de dependencias"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versiones candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generación de dependencias"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fusionando información disponible"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del archivo %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "No se pudo tratar el archivo de paquetes %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línea %lu mal formada en lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línea %lu mal formada en lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línea %lu mal formada en lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Línea %u mal formada en lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)"
@@ -2381,7 +2439,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "No se da soporte para el tipo de archivo de índice '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2389,7 +2447,7 @@ msgstr ""
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"éste."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2397,7 +2455,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes\n"
@@ -2413,10 +2471,17 @@ msgstr "Falta el directorio de listas %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta el directorio de archivos %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando fichero %li de %li (falta %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Leyendo Listado de Archivos"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2428,20 +2493,17 @@ msgstr "No se pudo encontrar el método %s."
msgid "Method %s did not start correctly"
msgstr "El método %s no se inició correctamente"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Cambio de medio: Por favor inserte el disco etiquetado\n"
-" '%s'\n"
-"en la unidad '%s' y presione Intro\n"
+msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema de paquetes '%s' no está soportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -2478,87 +2540,87 @@ msgstr "No se entiende el pin tipo %s"
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La caché tiene una versión incompatible de sistema de versiones"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Vaya, excedió el número de nombres de paquetes que este APT es capaz de "
"manejar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Vaya, excedió el número de dependencias que este APT es capaz de manejar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Ocurrió un error mientras procesaba %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Al procesar las dependencias de archivos no se encontró el\n"
"paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando caché fuente"
@@ -2567,11 +2629,15 @@ msgstr "Error de E/S guardando caché fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "falló el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2581,7 +2647,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,7 +2656,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2598,7 +2664,7 @@ msgstr ""
"Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "El tamaño difiere"
@@ -2703,59 +2769,74 @@ msgstr ""
"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Hay problemas abriendo %s"
+msgstr "Preparando %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abriendo %s"
+msgstr "Desempaquetando %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abriendo fichero de configuración %s"
+msgstr "Preparándose para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalados: "
+msgstr "%s instalado"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparándose para eliminar %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abriendo %s"
+msgstr "Eliminando %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomienda"
+msgstr "%s eliminado"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "No pude borrar %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La conexión se cerró prematuramente"
+#~ msgid "File date has changed %s"
+#~ msgstr "Cambió la fecha del archivo %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Leyendo Lista de Archivos"
+
+#~ msgid "Could not execute "
+#~ msgstr "No se pudo ejecutar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparándose para eliminar con su configuración %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Eliminado con su configuración %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "ID del fabricante '%s' desconocido en la línea %u de la lista de\n"
@@ -2965,9 +3046,6 @@ msgstr "La conexión se cerró prematuramente"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "No pude renombrar %s.new a %s"
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Por favor inserte un disco en la unidad y presione Intro"
-
#~ msgid "I found (binary):"
#~ msgstr "Encontré (binario):"
@@ -2986,16 +3064,9 @@ msgstr "La conexión se cerró prematuramente"
#~ "No pude localizar ningún archivo de paquete, tal vez este no es un disco "
#~ "de Debian"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr ""
-#~ "Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'"
-
#~ msgid " '"
#~ msgstr " '"
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr "Repita este proceso para el resto de los CDs del conjunto."
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/eu.po b/po/eu.po
index 81d1a588a..88504571d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,23 +1,21 @@
-# translation of eu.po to librezale.org
-# translation of apt_po_eu.po to librezale.org
-# translation of apt-eu.po to Basque
+# translation of apt_po_eu.po to librezale
# This file is put in the public domain.
-# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
-# Piarres Beobide <pi@beobide.net>, 2005.
#
+# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
+# Piarres Beobide <pi@beobide.net>, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-10-11 20:03+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-06-17 00:10+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: librezale.org <librezale@librezale.org>\n"
+"Language-Team: librezale <librezale@librezale.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"\n"
#: cmdline/apt-cache.cc:135
@@ -153,14 +151,14 @@ msgstr " Bertsio tabla:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s) konpilatua: %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -233,6 +231,19 @@ msgstr ""
" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
"Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Mesedez sa diska bat gailuan eta enter sakatu"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Parekatu gabeko argumentuak"
@@ -294,7 +305,7 @@ msgstr ""
" -c=? Irakurri konfigurazio-fitxategi hau\n"
" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
@@ -415,115 +426,126 @@ msgstr "Ez dago bat datorren hautapenik"
msgid "Some files are missing in the package file group `%s'"
msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Fitxategi-data aldatu egin da: %s"
+msgid "Failed to stat %s"
+msgstr "Huts egin du %s(e)tik datuak lortzean"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Artxiboak ez du kontrol-erregistrorik"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Ezin da %s direktorioa irakurri\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Ezin da %s atzitu\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Erroreak fitxategiari dagozkio "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Huts egin du %s ebaztean"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Huts egin dute zuhaitz-urratsek"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Huts egin du %s irekitzean"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Huts egin du %s esteka irakurtzean"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Huts egin du %s desestekatzean"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Huts egin du %s(e)tik datuak lortzean"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete-eremurik"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s: ez du override sarrerarik\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s: ez du override sarrerarik\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -619,79 +641,79 @@ msgstr "Arazoa %s desestekatzean"
msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " edo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -699,145 +721,145 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Mendekotasunak zuzentzen..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " : huts egin du."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ezin dira mendekotasunak zuzendu"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ezin da bertsio-berritzeko multzoa minimizatu"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Eginda"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Egiaztapen abisua gainidazten.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Zenbait pakete ezin dira egiaztatu"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
"berri emanez (ingelesez)"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Bai, egin esandakoa!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +870,28 @@ msgstr ""
"Jarratzeko, idatzi '%s' esaldia\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortatu."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,47 +899,47 @@ msgstr ""
"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
"--fix-missing aukerarekin saiatu?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Falta diren paketeak ezin dira zuzendu."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortatu instalazioa."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s pakete birtual bat da, honek hornitua:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalatuta]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Zehazki bat hautatu behar duzu instalatzeko."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -928,49 +950,49 @@ msgstr ""
"egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
"beste iturburu batean bakarrik egongo da erabilgarri\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Baina ondorengo paketeek ordezten dute:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s paketeak ez du instalatzeko hautagairik"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s bertsiorik berriena da jada.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda-direktorioa blokeatu"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -978,25 +1000,44 @@ msgstr ""
"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
"zaharrak erabili dira haien ordez."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Informazio honek arazoa konpontzen lagun dezake:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1004,7 +1045,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1016,7 +1057,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1025,121 +1066,125 @@ msgstr ""
"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
"izango, eta pakete horren errorearen berri ematea komeni da."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+msgstr ""
+"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
-msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
+msgstr ""
+"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1148,32 +1193,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1340,7 +1385,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
"berriro"
@@ -1353,19 +1399,19 @@ msgstr "Eskuragarrien datuak biltzen"
msgid "Failed to create pipes"
msgstr "Huts egin du kanalizazioak sortzean"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Huts egin du gzip exekutatzean "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Hondatutako artxiboa"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "%u TAR goiburu-mota ezezaguna, %s kidea"
@@ -1426,7 +1472,7 @@ msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s"
msgid "Failed to write file %s"
msgstr "Ezin izan da %s fitxategian idatzi"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ezin izan da %s fitxategia itxi"
@@ -1479,7 +1525,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -1509,9 +1556,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Pakete Zerrenda irakurtzen"
@@ -1525,7 +1572,7 @@ msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean"
msgid "Internal error getting a package name"
msgstr "Barne errorea pakete Izen bat eskuratzerakoan"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Fitxategi zerrendaketa irakurtzen"
@@ -1572,10 +1619,6 @@ msgstr "Barne errorea desbideratze bat gehitzean"
msgid "The pkg cache must be initialized first"
msgstr "Paketearen cachea hasieratu behar da lehendabizi"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Fitxategi zerrenda irakurtzen"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1599,7 +1642,8 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
+msgstr ""
+"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1638,7 +1682,8 @@ msgstr "CD okerra"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da."
+msgstr ""
+"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
#: methods/cdrom.cc:169
msgid "Disk not found."
@@ -1648,12 +1693,12 @@ msgstr "Ez da diska aurkitu"
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa-ordua ezartzean"
@@ -1739,7 +1784,8 @@ msgstr "Ezin izan da socket-a sortu"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
+msgstr ""
+"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1783,7 +1829,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1806,7 +1852,7 @@ msgstr "Datu-transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
msgid "Query"
msgstr "Kontsulta"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Ezin da deitu "
@@ -1833,70 +1879,74 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr ""
+"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ezin izan da konektatu -> %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Konektatzen -> %s..."
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ezin izan da '%s' ebatzi"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Aldi baterako akatsa '%s' ebaztean"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Ezin da eraztuna ebatzi: '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
-#: methods/gpgv.cc:191
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Ezin izan da %s exekutatu"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Errore ezezaguna gpgv exekutatzean"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1914,76 +1964,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Barne-errorea"
@@ -1996,7 +2046,7 @@ msgstr "Ezin da fitxategi huts baten mmap egin"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -2090,7 +2140,8 @@ msgstr "%s aukerak argumentu bat behar du."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
+msgstr ""
+"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2117,7 +2168,7 @@ msgstr "Eragiketa baliogabea: %s"
msgid "Unable to stat the mount point %s"
msgstr "Ezin da atzitu %s muntatze-puntua"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ezin da %s(e)ra aldatu"
@@ -2141,7 +2192,8 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
+msgstr ""
+"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
@@ -2264,74 +2316,89 @@ msgstr "aukerakoa"
msgid "extra"
msgstr "estra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Dependentzia zuhaitza eraikitzen"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Hautagaien bertsioak"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Dependentzi Sormena"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Eskuragarrien datuak biltzen"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s irekitzean"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s fitxategian idatzi"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ezin da %s pakete-fitxategia analizatu (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete-fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s iturburu-zerrendan"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)"
@@ -2353,12 +2420,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "'%s' motako indize-fitxategirik ez da onartzen"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2366,7 +2435,7 @@ msgstr ""
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
@@ -2380,10 +2449,17 @@ msgstr "%spartial zerrenda-direktorioa falta da."
msgid "Archive directory %spartial is missing."
msgstr "%spartial artxibo-direktorioa falta da."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li fitxategia jasotzen %li-tik"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2395,17 +2471,17 @@ msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu."
msgid "Method %s did not start correctly"
msgstr "%s metodoa ez da behar bezala abiarazi"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete-sistema ez da onartzen"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu"
@@ -2439,82 +2515,82 @@ msgstr "Ez da ulertu %s orratz-mota (pin)"
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cachearen bertsio-sistema ez da bateragarria"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Fitxategi-erreferentziak biltzen"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu-cachea gordetzean"
@@ -2523,11 +2599,15 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2536,7 +2616,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2545,14 +2625,15 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2653,7 +2734,8 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
+msgstr ""
+"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
@@ -2697,15 +2779,17 @@ msgstr "%s kendurik"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "%s konfigurazioaz ezabatzeko prestatzen"
+msgid "Preparing to completely remove %s"
+msgstr "%s guztiz ezabatzeko prestatzen"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr "%s konfigurazioaz kentzen"
+msgid "Completely removed %s"
+msgstr "%s guztiz ezabatu da"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
+#~ msgid "File date has changed %s"
+#~ msgstr "Fitxategi-data aldatu egin da: %s"
diff --git a/po/fi.po b/po/fi.po
index 3bccbd964..c1eaf0053 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: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-15 14:09+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -148,14 +148,14 @@ msgstr " Versiotaulukko:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,22 @@ msgstr ""
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
"Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Taltion vaihto: Pistä levy \n"
+"\"%s\"\n"
+"asemaan \"%s\" ja paina Enter\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Parametrit eivät ole pareittain"
@@ -289,7 +305,7 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -415,115 +431,126 @@ msgstr "Mitkään valinnat eivät täsmänneet"
msgid "Some files are missing in the package file group `%s'"
msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Tietokanta on vanha, yritetään päivittää %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Tiedoston uusi päiväys %s"
+msgid "Failed to stat %s"
+msgstr "Tiedostolle %s ei toimi stat"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkistolla ei ole ohjaustietuetta"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Tiedostolle %s ei toimi stat"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ei poikkeustietuetta\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s: ei poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s: ei poikkeustietuetta\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -619,79 +646,79 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " tai"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -700,145 +727,145 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Korjataan riippuvuuksia..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " ei onnistunut."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Riippuvuuksien korjaus ei onnistu"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Päivitysjoukon minimointi ei onnistu"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Valmis"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Noudettavaa arkistoa %st/%st.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Noudettavaa arkistoa %st.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -849,28 +876,28 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Keskeytä."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -878,47 +905,47 @@ msgstr ""
"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai "
"kokeile --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Puuttuvia paketteja ei voi korjata."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Asennus keskeytetään."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Asennettu]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Yksi pitää valita asennettavaksi."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -929,49 +956,49 @@ msgstr ""
"Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
"saatavilla vain jostain muusta lähteestä\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketilla %s ei ole asennettavaa valintaa"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s on jo uusin versio.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -979,25 +1006,44 @@ msgstr ""
"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
"käytetty vanhoja. "
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1005,7 +1051,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1016,7 +1062,7 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1026,116 +1072,117 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1143,7 +1190,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1152,32 +1199,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1358,19 +1405,19 @@ msgstr "Yhdistetään saatavuustiedot"
msgid "Failed to create pipes"
msgstr "Putkien luonti ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "exec gzip ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
@@ -1431,7 +1478,7 @@ msgstr "Asetustiedoston kaksoiskappale %s/%s"
msgid "Failed to write file %s"
msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Tiedoston %s sulkeminen ei onnistunut"
@@ -1484,7 +1531,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -1514,9 +1562,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Luetaan pakettiluetteloita"
@@ -1530,7 +1578,7 @@ msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut"
msgid "Internal error getting a package name"
msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Luetaan tiedostoluetteloa"
@@ -1577,10 +1625,6 @@ msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
msgid "The pkg cache must be initialized first"
msgstr "Pakettivarasto on ensin alustettava"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Luetaan tiedostoluetteloa"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1654,12 +1698,12 @@ msgstr "Tiedostoa ei löydy"
msgid "File not found"
msgstr "Tiedostoa ei löydy"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1787,7 +1831,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1810,7 +1854,7 @@ msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
msgid "Query"
msgstr "Kysely"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
@@ -1839,71 +1883,71 @@ msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Avataan yhteys %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nimeä \"%s\" ei voitu selvittää"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nimeä \"%s\" ei voitu selvittää"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Lukkoa %s ei saada"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1919,76 +1963,76 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2001,7 +2045,7 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2122,7 +2166,7 @@ msgstr "Virheellinen toiminto %s"
msgid "Unable to stat the mount point %s"
msgstr "Komento stat ei toiminut liitoskohdalle %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kansioon %s vaihto ei onnistu"
@@ -2267,74 +2311,89 @@ msgstr "valinnainen"
msgid "extra"
msgstr "ylimääräinen"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Muodostetaan riippuvuussuhteiden puu"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Mahdolliset versiot"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Luodaan riippuvuudet"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yhdistetään saatavuustiedot"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
@@ -2355,13 +2414,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2369,7 +2428,7 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
@@ -2383,11 +2442,18 @@ msgstr "Luettelokansio %spartial puuttuu."
msgid "Archive directory %spartial is missing."
msgstr "Arkistokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Luetaan tiedostoluetteloa"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2398,7 +2464,7 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
msgid "Method %s did not start correctly"
msgstr "Menetelmä %s ei käynnistynyt oikein"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2406,12 +2472,12 @@ msgstr ""
"\"%s\"\n"
"asemaan \"%s\" ja paina Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2446,83 +2512,83 @@ msgstr "Tunnistetyyppi %s on tuntematon"
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
@@ -2531,11 +2597,15 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2544,7 +2614,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2553,7 +2623,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2561,7 +2631,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2709,19 +2779,29 @@ msgid "Removed %s"
msgstr "Suosittelut"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Avataan asetustiedosto %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Tiedoston %s poistaminen ei onnistunut"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Yhteys katkesi ennenaikaisesti"
+#~ msgid "File date has changed %s"
+#~ msgstr "Tiedoston uusi päiväys %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Luetaan tiedostoluetteloa"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Lukkoa %s ei saada"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s"
diff --git a/po/fr.po b/po/fr.po
index 6fe746928..a7b74a6b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,21 @@
# translation of fr.po to French
# Advanced Package Transfer - APT message translation catalog
# French messages
-# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005.
#
+# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-09-23 08:37+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-18 09:31-0500\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#: cmdline/apt-cache.cc:135
@@ -149,14 +149,14 @@ msgstr " Table de version :"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pour %s %s est compilé le %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -233,6 +233,22 @@ msgstr ""
"Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n"
"d'informations.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+"Veuillez répéter cette opération pour tous les disques de votre jeu de "
+"cédéroms."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Les arguments ne sont pas en parité"
@@ -294,14 +310,15 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
@@ -417,117 +434,129 @@ msgstr "Aucune sélection ne correspond"
#: ftparchive/apt-ftparchive.cc:835
#, 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 »"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, 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:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, 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:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "La date du fichier a changé %s"
+msgid "Failed to stat %s"
+msgstr "Impossible de statuer %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "L'archive n'a pas d'enregistrement de contrôle"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A : Impossible de statuer %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E : "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A : "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E : des erreurs sont survenues sur le fichier "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossible de résoudre %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Échec du parcours de l'arbre"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Impossible d'ouvrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Délier %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossible de lire le lien %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossible de délier %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossible de lier %s à %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Impossible de statuer %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr "%s ne possède pas d'entrée « override »\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr "%s ne possède pas d'entrée « override »\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -623,79 +652,79 @@ msgstr "Problème en déliant %s"
msgid "Failed to rename %s to %s"
msgstr "Impossible de changer le nom %s en %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mais %s est installé"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra être installé"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mais il n'est pas installé"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mais ne sera pas installé"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installés :"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS :"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés :"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour :"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changés :"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -704,137 +733,139 @@ msgstr ""
"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
"que vous êtes en train de faire."
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis à jour, %lu nouvellement installés, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version inférieure, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installés ou enlevés.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Correction des dépendances..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " a échoué."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossible de corriger les dépendances"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fait"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Avertissement d'authentification ignoré.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Certains paquets n'ont pas pu être authentifiés"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
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"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
-msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée."
+msgstr ""
+"Les paquets doivent être enlevés mais la désinstallation est désactivée."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a été interrompu."
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut être lue."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
"courriel à apt@packages.debian.org."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Il est nécessaire de prendre %so dans les archives.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr ""
+"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -842,11 +873,11 @@ msgstr ""
# The space before the exclamation mark must not be a non-breaking space; this
# sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Oui, faites ce que je vous dis !"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -857,28 +888,28 @@ msgstr ""
"Pour continuer, tapez la phrase « %s »\n"
" ?]"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Annulation."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu être téléchargés."
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
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:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -886,47 +917,48 @@ msgstr ""
"Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
"get update ou essayer avec --fix-missing ?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+msgstr ""
+"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossible de corriger le fait que les paquets manquent."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Annulation de l'installation."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, sélection de %s au lieu de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installé]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Vous devez explicitement sélectionner un paquet à installer."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -938,49 +970,50 @@ msgstr ""
"devenu obsolète\n"
"ou qu'il n'est disponible que sur une autre source\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Cependant les paquets suivants le remplacent :"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Aucun paquet ne correspond au paquet %s"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+msgstr ""
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s est déjà la plus récente version disponible.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » est introuvable"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » n'a pu être trouvée"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Version choisie %s (%s) pour %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "La commande de mise à jour ne prend pas d'argument"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le répertoire de liste"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -988,25 +1021,47 @@ msgstr ""
"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
"ignorés, ou les anciens ont été utilisés à la place."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "L'information suivante devrait vous aider à résoudre la situation : "
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Erreur interne, la tentative de résolution du problème a cassé certaines "
+"parties"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
+msgstr ""
+"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1069,7 @@ msgstr ""
"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1026,7 +1081,7 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"été créés ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1035,118 +1090,119 @@ msgstr ""
"Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "L'information suivante devrait vous aider à résoudre la situation : "
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquets défectueux"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplémentaires suivants seront installés : "
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Paquets suggérés :"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Paquets recommandés :"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Échec"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
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:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, 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:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nécessité de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, 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:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, 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:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1155,7 +1211,7 @@ 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1164,32 +1220,33 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
"du paquet %s ne peut satisfaire à la version requise"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+msgstr ""
+"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1362,7 +1419,8 @@ msgstr ""
"seules les erreurs"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"précédant ce message sont importantes. Veuillez les corriger et\n"
"démarrer l'[I]nstallation une nouvelle fois."
@@ -1375,19 +1433,19 @@ msgstr "Fusion des informations disponibles"
msgid "Failed to create pipes"
msgstr "Échec de création de tubes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Impossible d'exécuter gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Archive corrompue"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
@@ -1448,7 +1506,7 @@ msgstr "Fichier de configuration en double %s/%s"
msgid "Failed to write file %s"
msgstr "Erreur d'écriture du fichier %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Échec de clôture du fichier %s"
@@ -1501,7 +1559,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -1533,9 +1592,9 @@ msgstr ""
"fichiers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lecture des listes de paquets"
@@ -1549,7 +1608,7 @@ msgstr "Impossible de changer pour le répertoire d'administration %sinfo"
msgid "Internal error getting a package name"
msgstr "Erreur interne lors de l'obtention d'un nom de paquet"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Lecture de la liste de fichiers"
@@ -1596,10 +1655,6 @@ msgstr "Erreur interne en ajoutant une déviation"
msgid "The pkg cache must be initialized first"
msgstr "Le cache des paquets doit être initialisé en premier"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lecture de la liste des fichiers"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1623,7 +1678,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1657,7 +1713,7 @@ msgstr ""
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr "Mauvais CD"
+msgstr "Mauvais cédérom"
#: methods/cdrom.cc:164
#, c-format
@@ -1674,12 +1730,12 @@ msgstr "Disque non trouvé."
msgid "File not found"
msgstr "Fichier non trouvé"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -1726,7 +1782,8 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+msgstr ""
+"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
#: methods/ftp.cc:291
#, c-format
@@ -1763,7 +1820,8 @@ msgstr "Impossible de créer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé"
+msgstr ""
+"Impossible de se connecter sur le port de données, délai de connexion dépassé"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1807,7 +1865,7 @@ msgstr "Délai de connexion au port de données dépassé"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problème de hachage du fichier"
@@ -1830,7 +1888,7 @@ msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
msgid "Query"
msgstr "Requête"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Impossible d'invoquer "
@@ -1859,72 +1917,77 @@ msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Connexion à %s: %s (%s) impossible."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connexion à %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ne parvient pas à résoudre « %s »"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%"
"s » (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Impossible de se connecter à %s %s :"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Impossible d'accèder au porte-clés : « %s »"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
-#: methods/gpgv.cc:191
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Impossible d'exécuter "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr "pour contrôler la signature (veuillez vérifier si gnupg est installé)."
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Impossible d'exécuter « %s » pour contrôler la signature\n"
+"(veuillez vérifier si gnupg est installé)."
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Erreur inconnue à l'exécution de gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1942,76 +2005,76 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s"
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tête"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tête"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possède un support des limites non-valide"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Sélection défaillante"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Délai de connexion dépassé"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erreur d'écriture du fichier de sortie"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erreur d'écriture sur un fichier"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erreur d'écriture sur le fichier"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Mauvais en-tête de donnée"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Échec de la connexion"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erreur interne"
@@ -2024,7 +2087,7 @@ msgstr "Impossible de mapper un fichier vide en mémoire"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
@@ -2147,7 +2210,7 @@ msgstr "L'opération %s n'est pas valable"
msgid "Unable to stat the mount point %s"
msgstr "Impossible de localiser le point de montage %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossible d'accéder à %s"
@@ -2292,77 +2355,96 @@ msgstr "optionnel"
msgid "extra"
msgstr "supplémentaire"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construction de l'arbre des dépendances"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versions possibles"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Génération des dépendances"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fusion des informations disponibles"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossible de traiter le fichier %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossible de traiter le fichier %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2381,14 +2463,15 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Le type de fichier d'index « %s » n'est pas accepté"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son "
"archive."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2396,7 +2479,7 @@ msgstr ""
"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être "
"causé par les paquets devant être gardés en l'état."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problèmes, des paquets défecteux sont en mode "
@@ -2412,11 +2495,18 @@ msgstr "Le répertoire %spartial pour les listes n'existe pas."
msgid "Archive directory %spartial is missing."
msgstr "Le répertoire d'archive %spartial n'existe pas."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Téléchargement du fichier %li de %li (%s restant)"
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Téléchargement du fichier %li de %li"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2427,19 +2517,19 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
msgid "Method %s did not start correctly"
msgstr "La méthode %s n'a pas démarré correctement"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
"touche Entrée."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le système de paquet « %s » n'est pas supporté"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de déterminer un type du système de paquets adéquat"
@@ -2450,7 +2540,8 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2477,101 +2568,108 @@ msgstr "Étiquette %s inconnue"
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Le cache possède un système de version incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Vous avez dépassé le nombre de noms de paquets que cet APT est capable de "
"traiter."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
+msgstr ""
+"Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Vous avez dépassé le nombre de dépendances que cet APT est capable de "
"traiter."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
"fichiers"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossible de localiser la liste des paquets sources %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Assemblage des fichiers listés dans les champs Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
-msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2581,7 +2679,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,14 +2688,15 @@ msgstr ""
"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Taille incohérente"
@@ -2744,15 +2843,17 @@ msgstr "%s supprimé"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Préparation de la purge de %s"
+msgid "Preparing to completely remove %s"
+msgstr "Préparation de la suppression complète de %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr "%s purgé"
+msgid "Completely removed %s"
+msgstr "%s complètement supprimé"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion fermée prématurément"
+#~ msgid "File date has changed %s"
+#~ msgstr "La date du fichier a changé %s"
diff --git a/po/gl.po b/po/gl.po
index 41dc38c38..de77c5e08 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,34 +1,34 @@
-# translation of apt.po to Galego
-# translation of apt.es.po to Galego
-# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005.
+# Galician translation of apt
+# This file is put in the public domain.
+# Jacobo Tarrío <jtarrio@debian.org>, 2005.
+#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-08-03 17:30+0200\n"
-"Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
-"Language-Team: Galego\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-11 18:09+0200\n"
+"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
+"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "O paquete %s versión %s ten dependencias incumplidas:\n"
+msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "Non se puido localizar o paquete %s"
+msgstr "Non se puido atopar o paquete %s"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr "Nomes de paquetes totais: "
+msgstr "Número total de nomes de paquetes : "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
@@ -40,60 +40,60 @@ msgstr " Paquetes virtuais puros: "
#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
-msgstr " Paquetes virtuais únicos: "
+msgstr " Paquetes virtuais simples: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
-msgstr " Paquetes virtuais mesturados: "
+msgstr " Paquetes virtuais mixtos: "
#: cmdline/apt-cache.cc:276
msgid " Missing: "
-msgstr " Faltan: "
+msgstr " Non atopados: "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr "Versións diferentes totais: "
+msgstr "Número total de versións distintas: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr "Dependencias totais: "
+msgstr "Número total de dependencias: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr "Relacións versión/ficheiro totais: "
+msgstr "Número total de relacións versión/ficheiro: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr "Mapeo Total de Provisións: "
+msgstr "Número total de mapas de Provides: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr "Cadeas globalizadas totais: "
+msgstr "Número total de cadeas: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr "Espazo de versión de dependencias total: "
+msgstr "Espazo total de versións de dependencias: "
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr "Espazo desperdiciado total: "
+msgstr "Espazo de reserva total: "
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr "Espazo rexistrado total: "
+msgstr "Espazo total contabilizado: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "O ficheiro de paquetes %s non está sincronizado."
+msgstr "O ficheiro de paquete %s está sen sincronizar."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "Debe dar exactamente un patrón"
+msgstr "Debe fornecer exactamente un patrón"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr "Non se atopou ningún paquete"
+msgstr "Non se atopou ningún paquete"
#: cmdline/apt-cache.cc:1462
msgid "Package files:"
@@ -102,30 +102,31 @@ msgstr "Ficheiros de paquetes:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"Caché fora de sincronismo, non se pode facer x-ref a un ficheiro de paquetes"
+"A caché está sen sincronizar, non se pode facer referencia a un ficheiro de "
+"paquetes"
#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
-msgstr "%4i %s\n"
+msgstr "[%4i] %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
-msgstr "Paquetes con pin:"
+msgstr "Paquetes inmobilizados:"
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
-msgstr "(non atopado)"
+msgstr "(non se atopou)"
#. Installed version
#: cmdline/apt-cache.cc:1515
msgid " Installed: "
-msgstr " Instalados: "
+msgstr " Instalado: "
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
-msgstr "(ningún)"
+msgstr "(ningún)"
#. Candidate Version
#: cmdline/apt-cache.cc:1522
@@ -134,26 +135,26 @@ msgstr " Candidato: "
#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
-msgstr " Pin do paquete: "
+msgstr " Inmobilizado: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
msgid " Version table:"
-msgstr " Táboa de versión:"
+msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -191,45 +192,59 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Uso: apt-cache [opcións] comando\n"
-" apt-cache [opcións] add ficheiro1 [ficheiro2 ...]\n"
-" apt-cache [opcións] showpkg paq1 [paq2 ...]\n"
+"Emprego: apt-cache [opcións] orde\n"
+" apt-cache [opcións] add fich1 [fich2 ...]\n"
+" apt-cache [opcións] showpkg paq1 [paq2 ...]\n"
+" apt-cache [opcións] showsrc paq1 [paq2 ...]\n"
"\n"
-"apt-cache e unha ferramenta de baixo nivel que se utiliza para manipular\n"
-"os ficheiros binarios de caché de APT e consultar información sobre estos\n"
+"apt-cache é unha ferramenta de baixo nivel que se emprega para manipular\n"
+"os ficheiros binarios de caché de APT e obter información deles\n"
"\n"
-"Comandos:\n"
-" add - Agrega un ficheiro de paquete á caché fonte\n"
-" gencaches - Crea ambas cachés, a de paquetes e a de fontes\n"
-" showpkg - Mostra algunha información xeral para un só paquete\n"
-" showsrc - Mostra a información de fonte\n"
-" stats - Mostra algunhas estatísticas básicas\n"
-" dump - Mostra o ficheiro enteiro nun formato terso\n"
-" dumpavail - Imprime un ficheiro dispoñible á saída estándar\n"
-" unmet - Mostra dependencias incumplidas\n"
-" search - Busca na lista de paquetes por un patrón de expresión regular\n"
-" show - Mostra un rexistro lexible para o paquete\n"
-" depends - Mostra a información de dependencias en bruto para o paquete\n"
-" rdepends - Mostra a información de dependencias inversas do paquete\n"
-" pkgnames - Lista os nomes de todos os paquetes\n"
-" dotty - Xera gráficas do paquete para GraphVis\n"
-" xvcg - Xera gráficas do paquete para xvcg\n"
-" policy - Mostra parámetros das normas\n"
+"Ordes:\n"
+" add - Engade un ficheiro de paquetes á caché de fontes\n"
+" gencaches - Reconstrúe as cachés de paquetes e fontes\n"
+" showpkg - Amosa información xeral dun paquete\n"
+" showsrc - Amosa os rexistros de fontes\n"
+" stats - Amosa algunhas estatísticas básicas\n"
+" dump - Amosa todo o ficheiro nun formato abreviado\n"
+" dumpavail - Saca un ficheiro de dispoñibles pola saída estándar\n"
+" unmet - Amosa as dependencias sen cumprir\n"
+" search - Busca unha expresión regular na lista de paquetes\n"
+" show - Amosa un rexistro lexible para o paquete\n"
+" depends - Amosa a información bruta de dependencias dun paquete\n"
+" rdepends - Amosa información de dependencias inversas dun paquete\n"
+" pkgnames - Amosa os nomes de tódolos paquetes\n"
+" dotty - Xera gráficas de paquetes para GraphVis\n"
+" xvcg - Xera gráficas de paquetes para xvcg\n"
+" policy - Amosa a configuración de normativa\n"
"\n"
-"Opcións:\n"
+"Opcións:\n"
" -h Este texto de axuda.\n"
-" -p=? A caché do paquete.\n"
-" -s=? A caché da fonte.\n"
-" -q Deshabilita o indicador de progreso.\n"
-" -i Mostra só dependencias importantes para comando incumplido.\n"
-" -c=? Lee este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración arbitraria, ex -o dir::\n"
-"cache=/tmp\n"
-"Vexa as páxinas do manual apt-cache(8) y apt.conf(5) para máis información.\n"
+" -p=? A caché de paquetes.\n"
+" -s=? A caché de fontes.\n"
+" -q Desactiva o indicador de progreso.\n"
+" -i Amosa só as dependencias importantes na orde unmet.\n"
+" -c=? Le este ficheiro de configuración.\n"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
+"Vexa as páxinas de manual de apt-cache(8) e apt.conf(5) para máis "
+"información.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Forneza un nome para este disco, coma \"Debian 2.1r1 Disco 1\""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Introduza un disco na unidade e prema Intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repita este proceso para o resto de CDs do seu conxunto."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "Argumentos non emparexados"
+msgstr "Os argumentos non van en parellas"
#: cmdline/apt-config.cc:76
msgid ""
@@ -246,24 +261,24 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uso: apt-config [opcións] comando\n"
+"Emprego: apt-config [opcións] orde\n"
"\n"
-"apt-config é unha ferramenta para ler o ficheiro de configuración de APT.\n"
+"apt-config é unha ferramenta simple para ler a configuración de APT\n"
"\n"
-"Comandos:\n"
-" shell - Modo shell\n"
-" dump - Mostra a configuración\n"
+"Ordes:\n"
+" shell - Modo de intérprete de ordes\n"
+" dump - Amosa a configuración\n"
"\n"
-"Opcións:\n"
+"Opcións:\n"
" -h Este texto de axuda.\n"
-" -c=? Lee este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración arbitraria, p. ex. -o dir::\n"
-" cache=/tmp\n"
+" -c=? Le este ficheiro de configuración\n"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr "%s non é un paquete DEB válido."
+msgstr "%s non é un paquete DEB válido."
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -278,50 +293,50 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uso: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
+"Emprego: apt-extracttemplates fich1 [fich2 ...]\n"
"\n"
-"apt-extracttemplates é unha ferramenta para extraer información de\n"
-"configuración e modelos de paquetes de debian.\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
"\n"
-"Opcións:\n"
-" -h Este texto de axuda.\n"
-" -t Define o directorio temporal\n"
-" -c=? Lee este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración arbitraria, p. ex. -o dir::"
-"cache=/tmp\n"
+"Opcións:\n"
+" -h Este texto de axuda\n"
+" -t Estabrece o directorio temporal\n"
+" -c=? Le este ficheiro de configuración\n"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Non se puido escribir en %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Non se pode atopar a versión de debconf. ¿Está debconf instalado?"
+msgstr "Non se puido obter a versión de debconf. ¿Debconf está instalado?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
-msgstr "Alista de extensión de paquetes é demasiado longa"
+msgstr "A lista de extensións de paquetes é longa de máis"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
#, c-format
msgid "Error processing directory %s"
-msgstr "Erro procesando o directorio %s"
+msgstr "Erro ao procesar o directorio %s"
#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
-msgstr "A lista de extensión de fontes é demasiado longa"
+msgstr "A lista de extensións de fontes é longa de máis"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Error escribindo cabeceiras de ficheiros de contido"
+msgstr "Erro ao gravar a cabeceira no ficheiro de contido"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr "Erro procesando contidos %s"
+msgstr "Erro ao procesar o contido %s"
#: ftparchive/apt-ftparchive.cc:556
msgid ""
@@ -364,133 +379,188 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
+"Emprego: apt-ftparchive [opcións] orde\n"
+"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n"
+" sources rutafontes [fichoverride [prefixoruta]]\n"
+" contents ruta\n"
+" release ruta\n"
+" generate config [grupos]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Soporta\n"
+"varios estilos de xeración, de totalmente automática a substitutos "
+"funcionais\n"
+"de dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n"
+"Packages ten o contido de tódolos campos de control de cada paquete, así\n"
+"coma a suma MD5 e o tamaño do ficheiro. Sopórtase un ficheiro de \"overrides"
+"\"\n"
+"para forzar o valor dos campos Priority e Section.\n"
+"\n"
+"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n"
+".dscs. Pódese empregar a opción --source-override para especificar un "
+"ficheiro\n"
+"de \"overrides\" para fontes.\n"
+"\n"
+"As ordes \"packages\" e \"sources\" deberían se executar na raíz da árbore.\n"
+"\"Rutabinaria\" debería apuntar á base da busca recursiva e o ficheiro\n"
+"\"fichoverride\" debería conter os modificadores de \"override\". "
+"\"Prefixoruta\"\n"
+"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n"
+"de emprego do arquivo de Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcións:\n"
+" -h Este texto de axuda\n"
+" --md5 Controla a xeración de MD5\n"
+" -s=? Ficheiro de \"override\" de fontes\n"
+" -q Non produce ningunha saída por pantalla\n"
+" -d=? Escolle a base de datos de caché opcional\n"
+" --no-delink Activa o modo de depuración de desligado\n"
+" --contents Controla a xeración do ficheiro de contido\n"
+" -c=? Le este ficheiro de configuración\n"
+" -o=? Estabrece unha opción de configuración"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr "Ningunha selección coincide"
+msgstr "Ningunha selección encaixou"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltan algúns ficheiros no grupo de ficheiro de paquetes `%s'"
+msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\""
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD corrompida, ficheiro renomeado a %s.old"
+msgstr ""
+"A base de datos estaba corrompida, cambiouse o nome do ficheiro a %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB anticuada, tentando actualizar %s"
+msgstr "A base de datos é antiga, trátase de actualizar %s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Non se puido abrir o ficheiro DB %s: %s"
+msgstr "Non se puido abrir o ficheiro de base de datos %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Cambiou a data do ficheiro %s"
+msgid "Failed to stat %s"
+msgstr "Non se atopou %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr "Non hai rexistro de control do arquivo"
+msgstr "O arquivo non ten un rexistro de control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Non se puido obter un cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Non se puido ler o directorio %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "A: Non se puido ler %s\n"
+msgstr "A: Non se atopou %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
-msgstr "E: Erros aplicables ao ficheiro "
+msgstr "E: Os erros aplícanse ao ficheiro "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Non se puido resolver %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
-msgstr "Fallou o recorrido pola árbore."
+msgstr "O percorrido da árbore fallou"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Non se puido abrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr " DesLig %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
-msgstr "Non se puido ler a ligazón %s"
+msgstr "Non se puido ler a ligazón %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
-msgstr "Non se puido desligar %s"
+msgstr "Non se puido borrar %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Non puiden ligar %s con %s"
+msgstr "*** Non se puido ligar %s con %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink chegou ao límite de %sB.\n"
+msgstr " Alcanzouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Non puiden ler %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
-msgstr "O arquivo non ten campo de paquetes"
+msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s no ten entrada de predominio\n"
+msgstr " %s non ten unha entrada de \"override\"\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " o encargado de %s é %s e non %s\n"
+msgstr " O mantedor de %s é %s, non %s\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s non ten unha entrada de \"override\"\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s non ten unha entrada de \"override\"\n"
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "Erro interno, non puiden localizar o membro %s"
+msgstr "Erro interno, non se puido atopar o membro %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Non puido reservar memoria"
+msgstr "realloc - Non se puido reservar memoria"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
@@ -500,48 +570,48 @@ msgstr "Non se puido abrir %s"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "Predominio mal formado %s líña %lu #1"
+msgstr "\"Override\" %s liña %lu mal formado (1)"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "Predominio mal formado %s líña %lu #2"
+msgstr "\"Override\" %s liña %lu mal formado (2)"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "Predominio mal formado %s líña %lu #3"
+msgstr "\"Override\" %s liña %lu mal formado (3)"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Non se puido ler o ficheiro de \"overrides\" %s"
#: ftparchive/multicompress.cc:75
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo descoñecido de compresión '%s'"
+msgstr "Algoritmo de compresión \"%s\" descoñecido"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Saída comprimida %s necesita una ferramenta de compresión"
+msgstr "A saída comprimida %s precisa dun xogo de compresión"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Fallou a creación dunha tubería IPC para o subproceso"
+msgstr "Non se puido crear a canle IPC ao subproceso"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr "No se puido crear FICHEIRO*"
+msgstr "Non se puido crear o FILE*"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr "Non se puido bifurcar"
+msgstr "Non se puido chamar a fork"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr "Fillo de compresión"
+msgstr "Fillo de compresión"
#: ftparchive/multicompress.cc:238
#, c-format
@@ -550,7 +620,7 @@ msgstr "Erro interno, non se puido crear %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "Non se puido crear o subproceso IPC"
+msgstr "Non se puido crear o IPC do subproceso"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
@@ -558,582 +628,606 @@ msgstr "Non se puido executar o compresor "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
-msgstr "decompresor"
+msgstr "descompresor"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "Fallou a ES a subproceso/ficheiro"
+msgstr "A E/S ao subproceso/ficheiro fallou"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "Non se puido ler mentras se computaba MD5"
+msgstr "Non se puido ler ao calcular o MD5"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr "Hai problemas desligando %s"
+msgstr "Problema ao borrar %s"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Fallou o renome de %s a %s"
+msgstr "Non se puido cambiar o nome de %s a %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Erro de compilación de expresións regulares - %s"
+msgstr "Erro na compilación da expresión regular - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias incumplidas:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
-msgstr "pero %s está instalado"
+msgstr "pero %s está instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
-msgstr "pero %s vai ser instalado"
+msgstr "pero hase instalar %s"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
-msgstr "pero non é instalable"
+msgstr "pero non é instalable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
-msgstr "pero é un paquete virtual"
+msgstr "pero é un paquete virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr "pero non está instalado"
+msgstr "pero non está instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
-msgstr "pero non vai instalarse"
+msgstr "pero non se ha instalar"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr "Instalaranse os seguintes paquetes NOVOS:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr "Os seguintes paquetes ELIMINARANSE:"
+msgstr "Os seguintes paquetes hanse ELIMINAR:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr "Os seguintes paquetes retivéronse:"
+msgstr "Os seguintes paquetes consérvanse:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr "Actualizaranse os seguintes paquetes:"
+msgstr "Os seguintes paquetes hanse actualizar:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
-msgstr "DESACTUALIZARANSE os seguintes paquetes:"
+msgstr "Os seguintes paquetes hanse DESACTUALIZAR:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
-msgstr "Cambiaranse os seguintes paquetes retidos:"
+msgstr "Os seguintes paquetes retidos hanse modificar:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
-msgstr "%s (por %s) "
+msgstr "%s (debido a %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
+"AVISO: Hanse eliminar os seguintes paquetes esenciais.\n"
+"¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizados, %lu instalaranse, "
+msgstr "%lu actualizados, %lu instalados, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para eliminar e %lu non actualizados.\n"
+msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non instalados de todo ou eliminados.\n"
+msgstr "%lu non instalados ou eliminados de todo.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
-msgstr "Correxindo dependencias..."
+msgstr "A corrixir as dependencias..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fallou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
-msgstr "Non se pode correxir as dependencias"
+msgstr "Non se puido corrixir as dependencias."
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
-msgstr "Non se puido minimizar o conxunto de actualización"
+msgstr "Non se puido minimizar o xogo de actualizacións"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
-msgstr " Listo"
+msgstr " Rematado"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "Tal vez queira executar `apt-get -f install' para correxilo."
+msgstr "Pode querer executar \"apt-get -f install\" para corrixilos."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Probe de novo usando -f."
+msgstr "Dependencias incumpridas. Probe a empregar -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: ¡Non se puideron autenticar os seguintes paquetes!"
+msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ignórase o aviso de autenticación.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr "¿Instalar estos paquetes sen verificación [s/N]? "
+msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
-msgstr "Algúns paquetes non se poden autenticar"
+msgstr "Non se puido autenticar algúns paquetes"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
-msgstr "Hai problemas e utilizouse -y sen --force-yes"
+msgstr "Houbo problemas e empregouse -y sen --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos."
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
-msgstr "Os paquetes necesitan eliminarse pero Remove está deshabilitado."
+msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Erro interno, non se puido crear %s"
+msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
-msgstr "Non se puido bloquear o directorio de descarga"
+msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
-msgstr "Non se puideron ler as listas de fontes."
+msgstr "Non se puido ler a lista de orixes."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Necesítase descargar %sB/%sB de arquivos.\n"
+msgstr "Hai que recibir %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "Necesito descargar %sB de arquivos.\n"
+msgstr "Hai que recibir %sB de arquivos.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-"Utilizaranse %sB de espacio de disco adicional despois de desempaquetar.\n"
+msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Liberaranse %sB despois de desempaquetar.\n"
+msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Non ten suficiente espazo libre en %s"
+msgstr "Non se puido determinar o espazo libre en %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "Non ten suficiente espazo libre en %s."
+msgstr "Non hai espazo libre de abondo en %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Especificouse Trivial Only pero ésta non é unha operación trivial."
+msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
-msgstr "Sí, ¡faga o que lle digo!"
+msgstr "¡Si, fai o que digo!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
+"Está a piques de facer algo perigoso.\n"
+"Para continuar escriba a frase \"%s\"\n"
+" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
-msgstr "Abortado."
+msgstr "Abortar."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
-msgstr "¿Desexa continuar [S/n]? "
+msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Imposible obter %s %s\n"
+msgstr "Non se puido obter %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
-msgstr "Algúns ficheiros non puideron descargarse"
+msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
-msgstr "Descarga completa e en modo de só descarga"
+msgstr "Completouse a descarga no modo de só descargas"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Non se puideron obter algúns arquivos, ¿quizais deba executar\n"
-"apt-get update ou deba intentalo de novo con --fix-missing?"
+"Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
+"missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Actualmente non están soportados --fix-missing e intercambio de medio"
+msgstr ""
+"O emprego conxunto de --fix-missing e intercambio de discos non está "
+"soportado"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
-msgstr "Non se puideron correxir os paquetes que faltan."
+msgstr "Non se puido corrixir os paquetes non dispoñibles."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
-msgstr "Abortando a instalación."
+msgstr "A abortar a instalación."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, seleccionando %s no lugar de %s\n"
+msgstr "Nota, escóllese %s no canto de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ignorando %s, xa está instalado e a actualización non está activada.\n"
+msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "O paquete %s non está instalado, non se eliminará\n"
+msgstr "O paquete %s non está instalado, así que non se eliminou\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "O paquete %s é un paquete virtual provisto por:\n"
+msgstr "O paquete %s é un paquete virtual fornecido por:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr "Necesita seleccionar explicitamente un para instalar."
+msgstr "Debería escoller un para instalar."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"O paquete %s non está dispoñible, pero algún outro paquete fai referencia\n"
-"a el. Isto pode significar que o paquete falta, está obsoleto ou só se\n"
-"atopa dispoñible desde algunha outra fonte\n"
+"O paquete %s non está dispoñible, pero outro paquete fai referencia a el.\n"
+"Isto pode significar que o paquete falla, está obsoleto ou só está\n"
+"dispoñible noutra fonte.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
-msgstr "Nembargantes, os seguintes paquetes o reemprazan:"
+msgstr "Nembargantes, os seguintes paquetes substitúeno:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "O paquete %s non ten candidato para súa instalación"
+msgstr "O paquete %s non ten un candidato para a instalación"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Non é posible reinstalar o paquete %s, non se pode descargar.\n"
+msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s xa está na súa versión máis recente.\n"
+msgstr "%s xa é a versión máis recente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Non se atopou a Distribución '%s' para '%s'"
+msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Non se atopou a versión '%s' para '%s'"
+msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "Versión seleccionada %s (%s) para %s\n"
+msgstr "Escolleuse a versión %s (%s) de %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
-msgstr "O comando de actualización non toma argumentos"
+msgstr "A orde \"update\" non toma argumentos"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Non se puido bloquear o directorio de listas"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Algúns ficheiros de índice non se puideron descargar, hanse ignorar,\n"
-"ou hanse empregar uns antigos no su lugar."
+"Non se puido descargar algúns ficheiros de índices; ignoráronse ou "
+"empregáronse uns vellos no seu lugar."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte información pode axudar a resolver a situación:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro interno, o resolvedor interno rompeu cousas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Erro Interno, AllUpgrade rompeu cousas"
+msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, seleccionando %s para a expresión regular '%s'\n"
+msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Tal vez queira executar `apt-get -f install' para correxilo:"
+msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Dependencias incumplidas. Intente 'apt-get -f install' sen paquetes (ou "
-"especifique unha solución)."
+"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
+"especifique unha solución)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Non se puideron instalar algúns paquetes. Isto pode significar que\n"
-"vostede pediu unha situación imposible ou, se está usando a distribución\n"
-"inestable, que algúns paquetes necesarios non foron creados ou foron\n"
-"movidos fora de Incoming."
+"Non se puido instalar algúns paquetes. Isto pode significar que solicitou\n"
+"unha situación imposible ou, se emprega a distribución inestable, que\n"
+"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Como só solicitou unha única operación, é extremadamente posible que o\n"
-"paquete simplemente non sexa instalable e debería de encher un informe de\n"
-"erro contra ese paquete."
+"Xa que só solicitou unha soa operación, é bastante probable que o\n"
+"paquete non sea instalable e que se deba informar dun erro no paquete."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte información pode axudar a resolver a situación:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "Instalaranse os seguintes paquetes extras:"
+msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
-msgstr "Paquetes suxeridos:"
+msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
-msgstr "Paquetes recomendados"
+msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr "Calculando a actualización... "
+msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
-msgstr "Listo"
+msgstr "Rematado"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade rompeu cousas"
+msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
-msgstr "Debe especificar ao menos un paquete para obter seu código fonte"
+msgstr ""
+"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "Non se puido atopar un paquete de fontes para %s"
+msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "Non ten suficiente espazo libre en %s"
+msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Necesito descargar %sB/%sB de arquivos fonte.\n"
+msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Necesito descargar %sB de arquivos fonte.\n"
+msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
-msgstr "Fonte obtida %s\n"
+msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
-msgstr "Non se puideron obter algúns arquivos."
+msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Ignorando desempaquetamento de paquetes xa desempaquetados en %s\n"
+msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Fallou o comando de desempaquetamento '%s'.\n"
+msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Fallou o comando de construcción '%s'.\n"
+msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
-msgstr "Fallou o proceso fillo"
+msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Debe especificar ao menos un paquete para verificar súas\n"
-"dependencias de construcción"
+"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
+"de compilación"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Non se puido obter información de dependencias de construcción para %s"
+msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s non ten dependencias de construcción.\n"
+msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"A dependencia %s en %s non pode satisfacerse porque non se pode \n"
-"atopar o paquete %s"
+"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
+"o paquete %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"A dependencia %s en %s non pode satisfacerse porque ningunha versión\n"
-"dispoñible do paquete %s satisfai os requisitos de versión"
+"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
+"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Non se puido satisfacer a dependencia %s para %s: O paquete instalado %s é "
-"demasiado novo"
+"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
+"novo de máis"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Non se puido satisfacer a dependencia %s para %s: %s"
+msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "No se puideron satisfacer as dependencias de construcción de %s."
+msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
-msgstr "Non se puideron procesar as dependencias de construcción"
+msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
-msgstr "Módulos soportados:"
+msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1174,53 +1268,54 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-get [opcións] comando\n"
-" apt-get [opcións] install|remove paq1 [paq2 ...]\n"
-" apt-get [opcións] source paq1 [paq2 ...]\n"
+"Emprego: apt-get [opcións] orde\n"
+" apt-get [opcións] install|remove paq1 [paq2 ...]\n"
+" apt-get [opcións] source paq1 [paq2 ...]\n"
"\n"
-"apt-get é unha sinxela interface de líña de comandos para descargar e\n"
-"instalar paquetes. Os comandos máis empregados son update e install.\n"
+"apt-get é unha simple interface de liña de ordes para descargar e instalar\n"
+"paquetes. As ordes empregadas máis habitualmente son \"update\" e \"install"
+"\".\n"
"\n"
-"Comandos:\n"
-" update - Descarga novas listas de paquetes\n"
-" upgrade - Realiza unha actualización\n"
-" install - Instala novos paquetes (paquete é libc6 e non libc6.deb)\n"
+"Ordes:\n"
+" update - Descarga as novas listas de paquetes\n"
+" upgrade - Realiza unha actualización\n"
+" install - Instala novos paquetes (o paquete chámase libc6, non libc6."
+"deb)\n"
" remove - Elimina paquetes\n"
-" source - Descarga arquivos fuente\n"
-" build-dep - Configura as dependencias de construcción para paquetes "
-"fonte\n"
-" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n"
-" dselect-upgrade - Segue as seleccións de dselect\n"
-" clean - Elimina os arquivos descargados\n"
-" autoclean - Elimina os arquivos descargados antigos\n"
-" check - Verifica que non haxa dependencias incumplidas\n"
+" source - Descarga arquivos de código fonte\n"
+" build-dep - Configura as dependencias de compilación dos paquetes fonte\n"
+" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n"
+" dselect-upgrade - Sigue as seleccións de dselect\n"
+" clean - Borra os arquivos descargados\n"
+" autoclean - Borra os arquivos antigos descargados\n"
+" check - Verifica que non hai dependencias rotas\n"
"\n"
-"Opcións:\n"
+"Opcións:\n"
" -h Este texto de axuda.\n"
-" -q Saída rexistrable - sen indicador de progreso\n"
-" -qq Sen saída, excepto se hai erros\n"
-" -d Só descarga - NON instala ou desempaqueta os arquivos\n"
-" -s Non actúa. Realiza unha simulación\n"
-" -y Asume Sí para todas as consultas\n"
-" -f Intenta continuar se a comprobación de integridade faia\n"
-" -m Intenta continuar se os arquivos non son localizables\n"
-" -u Mostra tamén unha lista de paquetes actualizados\n"
-" -b Constrúe o paquete fonte despois de obtelo\n"
-" -V Mosta números de versión detallados\n"
-" -c=? Lee este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración arbitraria, p. ex. \n"
-" -o dir::cache=/tmp\n"
-"Consulte as páxinas do manual de apt-get(8), sources.list(5) e apt.conf(5)\n"
-"para máis información e opcións.\n"
-" Este APT ten poderes de Super Vaca.\n"
+" -q Saída que se pode rexistrar - sen indicador de progreso\n"
+" -qq Sen saída agás os erros\n"
+" -d Só descarga - NON instala nin desempaqueta os arquivos\n"
+" -s No-act. Realiza unha simulación de ordeamento\n"
+" -y Supón \"Sí\" a tódalas preguntas e non as amosa\n"
+" -f Tenta continuar se a comprobación de integridade falla\n"
+" -m Tenta continuar se non se poden localizar os arquivos\n"
+" -u Tamén amosa unha lista de paquetes actualizados\n"
+" -b Constrúe o paquete fonte despois de o descargar\n"
+" -V Amosa números detallados de versión\n"
+" -c=? Le este ficheiro de configuración\n"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
+"Vexa as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) para\n"
+"ver máis información e opcións.\n"
+" Este APT ten Poderes de Super Vaca.\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "Obx "
+msgstr "Teño "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "Des:"
+msgstr "Rcb:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
@@ -1233,12 +1328,12 @@ msgstr "Err "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Descargados %sB en %s (%sB/s)\n"
+msgstr "Recibíronse %sB en %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " [Traballando]"
+msgstr " [A traballar]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1247,13 +1342,13 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Troco de medio: Por favor insire o disco etiquetado\n"
-" '%s'\n"
-"na unidade '%s' e prema Intro\n"
+"Cambio de soporte: introduza o disco etiquetado\n"
+" \"%s\"\n"
+"na unidade \"%s\" e prema Intro\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "¡Rexistro de paquete descoñecido!"
+msgstr "¡Rexistro de paquete descoñecido!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1268,21 +1363,21 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uso: apt-sortpkgs [opcións] ficheiro1 [ficheiro2 ...]\n"
+"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
"\n"
-"apt-sortpkgs é unha ferramenta sinxela para ordenar ficheiros de paquetes.\n"
-"A opción -s utilízase para indicar qué tipo de ficheiro é.\n"
+"apt-sortpkgs é unha ferramenta simple para ordear ficheiros de paquetes.\n"
+"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
"\n"
-"Opcións:\n"
-" -h Este texto de axuda.\n"
-" -s Emprega ordenamiento de ficheiros fuente\n"
-" -c=? Lee este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración arbitraria, p. ex. -o dir::\n"
-"cache=/tmp\n"
+"Opcións:\n"
+" -h Este texto de axuda\n"
+" -s Emprega ordeamento por ficheiros fonte\n"
+" -c=? Le este ficheiro de configuración\n"
+" -o=? Estabrece unha opción de configuración; por exemplo, -o dir::cache=/"
+"tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr "¡Parámetro por omisión incorrecto!"
+msgstr "¡Configuración por defecto incorrecta!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
@@ -1291,217 +1386,207 @@ msgstr "Prema Intro para continuar."
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Ocorreron algúns erros mentras se desempaquetaba. Vase a configurar o"
+msgstr "Houbo algúns erros ao desempaquetar. Vanse configurar os paquetes"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "paquetes que foron instalados. Isto pode dar lugar a erros duplicados"
+msgstr "que se instalaron. Isto pode producir erros duplicados ou erros"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"ou erros causados por dependencias non presentes. Isto está BEN, só os\n"
-"erros"
+msgstr "causados por dependencias incumpridas. Isto é normal, só os erros"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"encima desta mensaxe son importantes. Por favor corríxaas e execute\n"
-"[I]nstall outra vez"
+"que hai enriba desta mensaxe son importantes. Arránxeos e volva instalar."
#: dselect/update:30
msgid "Merging available information"
-msgstr "Fusionando información dispoñible"
+msgstr "A mesturar a información sobre paquetes dispoñibles"
#: apt-inst/contrib/extracttar.cc:117
-#, fuzzy
msgid "Failed to create pipes"
-msgstr "No se puido crear FICHEIRO*"
+msgstr "Non se puido crear as canles"
-#: apt-inst/contrib/extracttar.cc:143
-#, fuzzy
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
-msgstr "Non se puido executar o compresor "
+msgstr "Non se puido executar gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
-msgstr ""
+msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
-msgstr ""
+msgstr "A suma de comprobación do arquivo tar non coincide, está corrompido"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr ""
+msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr ""
+msgstr "Sinatura de arquivo non válida"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr ""
+msgstr "Erro ao ler a cabeceira do membro do arquivo"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr ""
+msgstr "Cabeceira do membro do arquivo non válida"
#: apt-inst/contrib/arfile.cc:131
-#, fuzzy
msgid "Archive is too short"
-msgstr "Non hai rexistro de control do arquivo"
+msgstr "O arquivo é curto de máis"
#: apt-inst/contrib/arfile.cc:135
-#, fuzzy
msgid "Failed to read the archive headers"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Non se puido ler as cabeceiras dos arquivos"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr ""
+msgstr "Chamouse a DropNode nun nodo aínda ligado"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr ""
+msgstr "Non se puido atopar o elemento hash"
#: apt-inst/filelist.cc:463
-#, fuzzy
msgid "Failed to allocate diversion"
-msgstr "realloc - Non puido reservar memoria"
+msgstr "Non se puido reservar un desvío"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
-msgstr ""
+msgstr "Erro interno en AddDiversion"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s"
#: apt-inst/filelist.cc:510
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr ""
+msgstr "Desvío %s -> %s engadido dúas veces"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr ""
+msgstr "Ficheiro de configuración %s/%s duplicado"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Non se puido resolver %s"
+msgstr "Non se puido gravar o ficheiro %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
-#, fuzzy, c-format
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
msgid "Failed to close file %s"
-msgstr "Non se puido abrir %s"
+msgstr "Non se puido pechar o ficheiro %s"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "The path %s is too long"
-msgstr "A lista de extensión de fontes é demasiado longa"
+msgstr "A ruta %s é longa de máis"
#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr ""
+msgstr "A desempaquetar %s máis dunha vez"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr ""
+msgstr "O directorio %s está desviado"
#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
+msgstr "O paquete tenta gravar no destino do desvío %s/%s"
#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
-#, fuzzy
msgid "The diversion path is too long"
-msgstr "A lista de extensión de fontes é demasiado longa"
+msgstr "A ruta do desvío é longa de máis"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
+msgstr "O directorio %s estase a substituír por algo que non é un directorio"
#: apt-inst/extract.cc:283
-#, fuzzy
msgid "Failed to locate node in its hash bucket"
-msgstr "Fallou a creación dunha tubería IPC para o subproceso"
+msgstr "Non se puido atopar o nodo no seu caldeiro hash"
#: apt-inst/extract.cc:287
msgid "The path is too long"
-msgstr ""
+msgstr "A ruta é longa de máis"
#: apt-inst/extract.cc:417
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr ""
+msgstr "Coincidencia na sobrescritura sen versión para %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
+msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
-#, fuzzy, c-format
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
msgid "Unable to read %s"
-msgstr "Non se puido abrir %s"
+msgstr "Non se pode ler %s"
#: apt-inst/extract.cc:494
-#, fuzzy, c-format
+#, c-format
msgid "Unable to stat %s"
-msgstr "A: Non se puido ler %s\n"
+msgstr "Non se atopou %s"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
-#, fuzzy, c-format
+#, c-format
msgid "Failed to remove %s"
-msgstr "Non se puido resolver %s"
+msgstr "Non se puido eliminar %s"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create %s"
-msgstr "Non se puido escribir en %s"
+msgstr "Non se pode crear %s"
#: apt-inst/deb/dpkgdb.cc:118
-#, fuzzy, c-format
+#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Non puiden ler %s"
+msgstr "Non se atopou %sinfo"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
+"Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
-#, fuzzy
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
-msgstr "Paquetes rotos"
+msgstr "A ler as listas de paquetes"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr ""
+msgstr "Non se puido cambiar ao directorio de administración %sinfo"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
-#, fuzzy
msgid "Internal error getting a package name"
-msgstr "Erro interno, non se puido crear %s"
+msgstr "Erro interno ao obter un nome de paquete"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
-msgstr ""
+msgstr "A ler a lista de ficheiros"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1510,819 +1595,820 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
+"Non se puido abrir o ficheiro de listas \"%sinfo/%s\". Se non pode "
+"recuperalo, baléireo e reinstale a mesma versión do paquete."
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
-#, fuzzy, c-format
+#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Non se puido ler o ficheiro de listas %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
-#, fuzzy
msgid "Internal error getting a node"
-msgstr "Erro interno, non se puido crear %s"
+msgstr "Erro interno ao obter un nodo"
#: apt-inst/deb/dpkgdb.cc:309
-#, fuzzy, c-format
+#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Non se puido abrir o ficheiro de desvíos %sdiversions"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr ""
+msgstr "O ficheiro de desvíos está corrompido"
#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Liña non válida no ficheiro de desvíos: %s"
#: apt-inst/deb/dpkgdb.cc:362
-#, fuzzy
msgid "Internal error adding a diversion"
-msgstr "Erro interno, non se puido crear %s"
+msgstr "Erro interno ao engadir un desvío"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
+msgstr "Ten que se inicializar a caché de paquetes primeiro"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
+msgstr "Non se puido atopar unha cabeceira Package:, desprazamento %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
+msgstr "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr ""
+msgstr "Erro ao analizar o MD5. Desprazamento %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\""
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
+msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\""
#: apt-inst/deb/debfile.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't change to %s"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido cambiar a %s"
#: apt-inst/deb/debfile.cc:138
-#, fuzzy
msgid "Internal error, could not locate member"
-msgstr "Erro interno, non puiden localizar o membro %s"
+msgstr "Erro interno, non se puido atopar un membro"
#: apt-inst/deb/debfile.cc:171
-#, fuzzy
msgid "Failed to locate a valid control file"
-msgstr "Non se puido ler o ficheiro de predominio %s"
+msgstr "Non se puido atopar un ficheiro de control válido"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr ""
+msgstr "Ficheiro de control non analizable"
#: methods/cdrom.cc:114
-#, fuzzy, c-format
+#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Non se puido localizar o paquete %s"
+msgstr "Non se puido ler a base de datos de CD-ROMs %s"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
+"Empregue apt-cdrom para que APT poida recoñecer este CD-ROM. Non se pode "
+"empregar apt-get update para engadir CD-ROMs"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "CD-ROM incorrecto"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
+msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "(non atopado)"
+msgstr "Non se atopou o disco"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
-#, fuzzy
msgid "File not found"
-msgstr "(non atopado)"
+msgstr "Non se atopou o ficheiro"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
-#, fuzzy
msgid "Failed to stat"
-msgstr "Non puiden ler %s"
+msgstr "Non se atopou"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#, fuzzy
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Non puiden ler %s"
+msgstr "Non se puido estabrecer a hora de modificación"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
+msgstr "URI non válido, os URIs locais non deben comezar por //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr ""
+msgstr "A se identificar"
#: methods/ftp.cc:168
-#, fuzzy
msgid "Unable to determine the peer name"
-msgstr "Non se puido minimizar o conxunto de actualización"
+msgstr "Non se puido determinar o nome do outro extremo"
#: methods/ftp.cc:173
-#, fuzzy
msgid "Unable to determine the local name"
-msgstr "Non se puido minimizar o conxunto de actualización"
+msgstr "Non se puido determinar o nome local"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "O servidor rexeitou a conexión e dixo: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr ""
+msgstr "A orde USER fallou, o servidor dixo: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr ""
+msgstr "A orde PASS fallou, o servidor dixo: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
+"Especificouse un servidor proxy pero non un script de conexión, Acquire::"
+"ftp::ProxyLogin está baleiro."
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
+msgstr "A orde do script de conexión \"%s\" fallou, o servidor dixo: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr ""
+msgstr "A orde TYPE fallou, o servidor dixo: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr ""
+msgstr "Tempo esgotado para a conexión"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr ""
+msgstr "O servidor pechou a conexión"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
-msgstr ""
+msgstr "Erro de lectura"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr ""
+msgstr "Unha resposta desbordou o buffer."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr ""
+msgstr "Corrupción do protocolo"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
-msgstr ""
+msgstr "Erro de escritura"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr ""
+msgstr "Non se puido crear un socket"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
msgstr ""
+"Non se puido conectar o socket de datos, o tempo esgotouse para a conexión"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Non se puido conectar o socket pasivo."
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
+msgstr "getaddrinfo non puido obter un socket para escoitar"
#: methods/ftp.cc:736
-#, fuzzy
msgid "Could not bind a socket"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido ligar un socket"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr ""
+msgstr "Non se puido escoitar no socket"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr ""
+msgstr "Non se puido determinar o nome do socket"
#: methods/ftp.cc:779
-#, fuzzy
msgid "Unable to send PORT command"
-msgstr "Non se puido obter un cursor"
+msgstr "Non se puido enviar a orde PORT"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr ""
+msgstr "Familia de enderezos %u (AF_*) descoñecida"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr ""
+msgstr "A orde EPRT fallou, o servidor dixo: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr ""
+msgstr "A conexión do socket de datos esgotou o tempo"
#: methods/ftp.cc:825
-#, fuzzy
msgid "Unable to accept connection"
-msgstr "Non se pode correxir as dependencias"
+msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
-#, fuzzy
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "Fallou o recorrido pola árbore."
+msgstr "Problema ao calcular o hash do ficheiro"
#: methods/ftp.cc:877
-#, fuzzy, c-format
+#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Non se puido abrir o ficheiro DB %s: %s"
+msgstr "Non se pode obter o ficheiro, o servidor dixo \"%s\""
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr ""
+msgstr "O socket de datos esgotou o tempo"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr ""
+msgstr "A transferencia de datos fallou, o servidor dixo \"%s\""
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr ""
+msgstr "Petición"
-#: methods/ftp.cc:1106
-#, fuzzy
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
-msgstr "Non se puido abrir %s"
+msgstr "Non se puido chamar a "
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr ""
+msgstr "A conectar a %s (%s)"
#: methods/connect.cc:71
#, c-format
msgid "[IP: %s %s]"
-msgstr ""
+msgstr "[IP: %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
+msgstr "Non se pode iniciar a conexión a %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
+msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr ""
+msgstr "Non se puido conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr ""
+msgstr "A conectar a %s"
-#: methods/connect.cc:165
-#, fuzzy, c-format
+#: methods/connect.cc:167
+#, c-format
msgid "Could not resolve '%s'"
-msgstr "Non se puido resolver %s"
+msgstr "Non se puido resolver \"%s\""
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr ""
+msgstr "Fallo temporal ao resolver \"%s\""
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr ""
+msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
-#: methods/connect.cc:221
-#, fuzzy, c-format
+#: methods/connect.cc:223
+#, c-format
msgid "Unable to connect to %s %s:"
-msgstr "Non se puido escribir en %s"
+msgstr "Non se pode conectar a %s %s:"
+
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Non se puido acceder ao chaveiro: \"%s\""
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
+"dixital da chave"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Atopouse alomenos unha sinatura non válida."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
+"Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg "
+"instalado?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Instalaranse os seguintes paquetes extras:"
+msgstr "As seguintes sinaturas non eran válidas:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Non se puido verificar as seguintes sinaturas porque a chave pública non "
+"está dispoñible:\n"
#: methods/gzip.cc:57
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido abrir unha canle para %s"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr ""
+msgstr "Erro de lectura do proceso %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr ""
+msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr ""
+msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr ""
+msgstr "Liña de cabeceira incorrecta"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "Este servidor HTTP ten un soporte de rangos roto"
-#: methods/http.cc:594
-#, fuzzy
+#: methods/http.cc:626
msgid "Unknown date format"
-msgstr "¡Rexistro de paquete descoñecido!"
+msgstr "Formato de data descoñecido"
-#: methods/http.cc:741
-#, fuzzy
+#: methods/http.cc:773
msgid "Select failed"
-msgstr " fallou."
+msgstr "Fallou a chamada a select"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
-msgstr ""
+msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:769
-#, fuzzy
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr "Error escribindo cabeceiras de ficheiros de contido"
+msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:797
-#, fuzzy
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr "Error escribindo cabeceiras de ficheiros de contido"
+msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:822
-#, fuzzy
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr "Error escribindo cabeceiras de ficheiros de contido"
+msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
-msgstr ""
+msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr ""
+msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr ""
+msgstr "A conexión fallou"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
-msgstr ""
+msgstr "Erro interno"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr ""
+msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+msgstr "Non se puido facer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr ""
+msgstr "Non se atopou a selección %s"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr ""
+msgstr "Abreviatura de tipo \"%c\" descoñecida"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr ""
+msgstr "A abrir o ficheiro de configuración %s"
#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
-msgstr ""
+msgstr "Liña %d longa de máis (máximo %d)"
#: apt-pkg/contrib/configuration.cc:608
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome."
#: apt-pkg/contrib/configuration.cc:627
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada"
#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Incluído de aquí"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\""
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
+msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
#: apt-pkg/contrib/progress.cc:154
#, c-format
msgid "%c%s... Error!"
-msgstr ""
+msgstr "%c%s... ¡Erro!"
#: apt-pkg/contrib/progress.cc:156
#, c-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Rematado"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
+msgstr "Non se coñece a opción de liña de ordes \"%c\" [de %s]."
#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr ""
+msgstr "Non se entende a opción de liña de ordes %s"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr ""
+msgstr "A opción de liña de ordes %s non é booleana"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr ""
+msgstr "A opción %s precisa dun argumento."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
+"Opción %s: A especificación de elemento de configuración debe ter un =<val>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
+msgstr "A opción %s precisa dun argumento enteiro, non \"%s\""
#: apt-pkg/contrib/cmndline.cc:268
-#, fuzzy, c-format
+#, c-format
msgid "Option '%s' is too long"
-msgstr "A lista de extensión de fontes é demasiado longa"
+msgstr "A opción \"%s\" é longa de máis"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr ""
+msgstr "O senso %s non se entende, probe \"true\" ou \"false\"."
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
msgid "Invalid operation %s"
-msgstr ""
+msgstr "Operación %s non válida"
#: apt-pkg/contrib/cdromutl.cc:55
-#, fuzzy, c-format
+#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "Non se puido escribir en %s"
+msgstr "Non se pode analizar o punto de montaxe %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
-#, fuzzy, c-format
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
msgid "Unable to change to %s"
-msgstr "Non se puido escribir en %s"
+msgstr "Non se pode cambiar a %s"
#: apt-pkg/contrib/cdromutl.cc:190
-#, fuzzy
msgid "Failed to stat the cdrom"
-msgstr "Non puiden ler %s"
+msgstr "Non se puido analizar o CD-ROM"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr ""
+msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
#: apt-pkg/contrib/fileutl.cc:87
-#, fuzzy, c-format
+#, c-format
msgid "Could not open lock file %s"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido abrir o ficheiro de bloqueo %s"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
+msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
#: apt-pkg/contrib/fileutl.cc:109
-#, fuzzy, c-format
+#, c-format
msgid "Could not get lock %s"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido obter o bloqueo %s"
#: apt-pkg/contrib/fileutl.cc:377
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr ""
+msgstr "Agardouse por %s pero non estaba alí"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr ""
+msgstr "O subproceso %s recibiu un fallo de segmento."
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
+msgstr "O subproceso %s devolveu un código de erro (%u)"
#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr ""
+msgstr "O subproceso %s saíu de xeito inesperado"
#: apt-pkg/contrib/fileutl.cc:436
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file %s"
-msgstr "Non se puido abrir o ficheiro DB %s: %s"
+msgstr "Non se puido abrir o ficheiro %s"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr ""
+msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr ""
+msgstr "escritura, aínda hai %lu para escribir pero non se puido"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr ""
+msgstr "Problema ao pechar o ficheiro"
#: apt-pkg/contrib/fileutl.cc:603
-#, fuzzy
msgid "Problem unlinking the file"
-msgstr "Hai problemas desligando %s"
+msgstr "Problema ao borrar o ficheiro"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr ""
+msgstr "Problema ao sincronizar o ficheiro"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr ""
+msgstr "Caché de paquetes baleira"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr ""
+msgstr "O ficheiro de caché de paquetes está corrompido"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr ""
+msgstr "O ficheiro de caché de paquetes é unha versión incompatible"
#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgstr "Este APT non soporta o sistema de versionamento \"%s\""
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr ""
+msgstr "A caché de paquetes construiuse para unha arquitectura diferente"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
-msgstr ""
+msgstr "Depende"
#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
-msgstr ""
+msgstr "PreDepende"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr ""
+msgstr "Suxire"
#: apt-pkg/pkgcache.cc:219
-#, fuzzy
msgid "Recommends"
-msgstr "Paquetes recomendados"
+msgstr "Recomenda"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr ""
+msgstr "Conflicto con"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
-msgstr ""
+msgstr "Substitúe a"
#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
-msgstr ""
+msgstr "Fai obsoleto a"
#: apt-pkg/pkgcache.cc:231
msgid "important"
-msgstr ""
+msgstr "importante"
#: apt-pkg/pkgcache.cc:231
msgid "required"
-msgstr ""
+msgstr "requirido"
#: apt-pkg/pkgcache.cc:231
msgid "standard"
-msgstr ""
+msgstr "estándar"
#: apt-pkg/pkgcache.cc:232
msgid "optional"
-msgstr ""
+msgstr "opcional"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
-msgstr ""
+msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
-msgstr ""
+msgstr "A construír a árbore de dependencias"
-#: apt-pkg/depcache.cc:61
-#, fuzzy
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
-msgstr " Candidato: "
+msgstr "Versións candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
-msgstr ""
+msgstr "Xeración de dependencias"
+
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "A mesturar a información sobre paquetes dispoñibles"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:199
#, fuzzy, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Non se puido localizar o paquete %s"
+msgid "Failed to open StateFile %s"
+msgstr "Non se puido abrir %s"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/depcache.cc:205
#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non se puido gravar o ficheiro %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
+
+#: apt-pkg/tagfile.cc:186
+#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "Non se puido localizar o paquete %s"
+msgstr "Non se pode analizar o ficheiro de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
+msgstr "Liña %lu mal formada na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
+msgstr "Liña %lu mal formada na lista de fontes %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
+msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
-msgstr ""
+msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
-msgstr ""
+msgstr "Liña %u longa de máis na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr ""
+msgstr "Liña %u mal formada na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
+msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2331,220 +2417,241 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+"Esta instalación ha requirir que se elimine temporalmente o paquete esencial "
+"%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, "
+"pero se o quere facer, active a opción APT::Force-LoopBreak."
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr ""
+msgstr "O tipo de ficheiros de índices \"%s\" non está soportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
+"O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
+"Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado "
+"por paquetes retidos."
-#: apt-pkg/algorithms.cc:1061
-#, fuzzy
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Non se puideron correxir os paquetes que faltan."
+msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr ""
+msgstr "O directorio de listas %spartial falla."
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr ""
+msgstr "O directorio de arquivos %spartial falla."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A obter o ficheiro %li de %li (fallan %s)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "A obter o ficheiro %li de %li"
#: apt-pkg/acquire-worker.cc:113
-#, fuzzy, c-format
+#, c-format
msgid "The method driver %s could not be found."
-msgstr "Non se puideron ler as listas de fontes."
+msgstr "Non se puido atopar o controlador de métodos %s."
#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
-msgstr ""
+msgstr "O método %s non se iniciou correctamente"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Troco de medio: Por favor insire o disco etiquetado\n"
-" '%s'\n"
-"na unidade '%s' e prema Intro\n"
+msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr ""
+msgstr "O sistema de empaquetamento \"%s\" non está soportado"
-#: apt-pkg/init.cc:135
-#, fuzzy
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
-msgstr "Non se puido atopar un paquete de fontes para %s"
+msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
#: apt-pkg/clean.cc:61
-#, fuzzy, c-format
+#, c-format
msgid "Unable to stat %s."
-msgstr "A: Non se puido ler %s\n"
+msgstr "Non se pode analizar %s."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list"
#: apt-pkg/cachefile.cc:73
-#, fuzzy
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Non se puideron ler as listas de fontes."
+msgstr ""
+"Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado."
#: apt-pkg/cachefile.cc:77
-#, fuzzy
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Tal vez queira executar `apt-get -f install' para correxilo:"
+msgstr "Pode querer executar apt-get update para corrixir estes problemas"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
+"Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
+"Package"
#: apt-pkg/policy.cc:291
#, c-format
msgid "Did not understand pin type %s"
-msgstr ""
+msgstr "Non se entendeu o tipo de inmobilización %s"
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
msgstr ""
+"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
-msgstr ""
+msgstr "A caché ten un sistema de versionamento incompatible"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
+msgstr "Guau, superou o número de versións que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
+msgstr "Guau, superou o número de dependencias que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
+msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros"
-#: apt-pkg/pkgcachegen.cc:574
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:577
+#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se atopou a lista de paquetes fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
-msgstr ""
+msgstr "A recoller as provisións de ficheiros"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
-msgstr ""
+msgstr "Erro de E/S ao gravar a caché de fontes"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr ""
+msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
+msgstr "Os MD5Sum non coinciden"
+
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
msgstr ""
+"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
+"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
+"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
+"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
+"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
+"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
+"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
-msgstr ""
+msgstr "Os tamaños non coinciden"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgstr "O bloque de provedor %s non contén unha pegada dixital"
#: apt-pkg/cdrom.cc:507
#, c-format
@@ -2552,46 +2659,49 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
+"A empregar o punto de montaxe de CD-ROMs %s\n"
+"A montar o CD-ROM\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
-msgstr ""
+msgstr "A identificar.. "
#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
-msgstr ""
+msgstr "Etiqueta armacenada: %s \n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgstr "A empregar o punto de montaxe de CD-ROMs %s\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgstr "A desmontar o CD-ROM\n"
#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
-msgstr ""
+msgstr "A agardar polo disco...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgstr "A montar o CD-ROM...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr ""
+msgstr "A buscar os ficheiros de índices no disco..\n"
#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
+"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr ""
+msgstr "Ese non é un nome válido, volva tentalo.\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2599,93 +2709,112 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
+"Este disco chámase: \n"
+"\"%s\"\n"
#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
-msgstr ""
+msgstr "A copiar as listas de paquetes..."
#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
-msgstr ""
+msgstr "A gravar a nova lista de fontes\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "As entradas da lista de fontes deste disco son:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
-msgstr ""
+msgstr "A desmontar o CD-ROM..."
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Graváronse %i rexistros.\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+"Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
+"coinciden\n"
#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Preparing %s"
-msgstr ""
+msgstr "A preparar %s"
#: apt-pkg/deb/dpkgpm.cc:359
#, c-format
msgid "Unpacking %s"
-msgstr ""
+msgstr "A desempaquetar %s"
#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Preparing to configure %s"
-msgstr ""
+msgstr "A se preparar para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Configuring %s"
-msgstr ""
+msgstr "A configurar %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalados: "
+msgstr "Instalouse %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "A se preparar para a eliminación de %s"
#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removing %s"
-msgstr ""
+msgstr "A eliminar %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Paquetes recomendados"
+msgstr "Eliminouse %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "A se preparar para eliminar %s completamente"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Eliminouse %s completamente"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr ""
+msgstr "A conexión pechouse prematuramente"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "A data do ficheiro cambiou %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "A ler a lista de paquetes"
+
+#~ msgid "Could not execute "
+#~ msgstr "Non se puido executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "A se preparar para a eliminación con config %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Eliminouse con config %s"
diff --git a/po/he.po b/po/he.po
index cca666d78..bd8116bbd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-01-04 18:51+0100\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
@@ -192,6 +192,18 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr ""
@@ -414,12 +426,12 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "המתחזק של %s ×”×•× %s ×•×œ× %s\n"
@@ -519,79 +531,79 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr "כשלון בשינוי ×”×©× %s ל-%s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "לחבילות הב×ות יש תלויות ×©×œ× × ×¢× ×•:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "×בל %s מותקנת"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "×בל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "×בל ×”×™× ××™× ×” ניתנת להתקנה"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "×בל ×”×™× ×—×‘×™×œ×” וירטו×לית"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "×בל ×”×™× ×œ× ×ž×•×ª×§× ×ª"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "×בל ×”×™× ××™× ×” הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr "×ו"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "החבילות החדשות הב×ות הולכות להיות מותקנות:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "החבילות הב×ות יוסרו:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "החבילות הב×ות מעובות:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "החבילות הב×ות ישודרגו:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "החבילות הב×ות ישודרגו מטה:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "החבילות המחוזקות הב×ות ישונו:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (בגלל %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -600,144 +612,144 @@ msgstr ""
"× ×– ×” ר ×”: החבילות החיוניות הב×ות יוסרו\n"
"על הפעולה להעשות *רק* ×× ×תה יודע מה ×תה עושה!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu משודרגי×, %lu ×ž×•×ª×§× ×™× ×—×“×©×™×, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu מותקנות מחדש, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu משודרגות מטה, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu יוסרו ו-%lu ×œ× ×™×©×•×“×¨×’×•.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ×œ× ×ž×•×ª×§× ×•×ª לחלוטין ×ו הוסרו.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "מתקן תלויות..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr "כשלון."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "×œ× ×ž×¦×œ×™×— לתקן תלויות"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "× ×– ×” ר ×”: החבילות החיוניות הב×ות יוסרו"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr "סיו×"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "×ולי תרצה להריץ 'apt-get -f install' כדי לתקן ×ת ×לו."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "תלויות ×©×œ× × ×¢× ×•. נסה להשתמש ב×פשרות -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "החבילות הב×ות ישודרגו:"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "היו בעיות וה×פשרות -y היתה בשימוש ×œ×œ× ×”×פשרות --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "×œ× ×ž×¦×œ×™×— לנעול ×ת ספרית ההורדה."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "רשימת המקורות ×œ× × ×™×ª× ×ª לקרי××”."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "צריך לקבל %sB/%sB מתוך ×”×רכיוני×.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "צריך לקבל %sB מתוך ×”×רכיוני×.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×”×™×• בשימוש.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×©×•×—×¨×¨×•.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "×ין לך מספיק ×ž×§×•× ×¤× ×•×™ ב-%s."
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "×ין לך מספיק ×ž×§×•× ×¤× ×•×™ ב-%s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "כן, עשה כפי ש×× ×™ ×ומר!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -745,75 +757,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "בטל."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "×”×× ×תה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהב×ת %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצי×"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -821,79 +833,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -901,159 +913,164 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגי××” פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1254,7 +1271,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "כשלון בפענוח %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1307,7 +1324,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1603,7 +1621,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1734,76 +1752,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr ""
@@ -1816,7 +1834,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1937,7 +1955,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2104,52 +2122,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2193,7 +2211,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2213,12 +2231,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2336,31 +2354,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cd11270e9..5b49b7de5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-15 18:03+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
-"Language-Team: Hungarian <gnome@gnome.hu>\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-07-02 07:34+0100\n"
+"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
+"Language-Team: Hungarian <debian-l10-hungarian>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Hungarian\n"
+"X-Poedit-Country: HUNGARY\n"
#: cmdline/apt-cache.cc:135
#, c-format
@@ -27,7 +29,7 @@ msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "%s csomag nem található"
+msgstr "Az alábbi csomag nem található: %s"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
@@ -149,14 +151,14 @@ msgstr " Verziótáblázat:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -230,6 +232,18 @@ msgstr ""
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
"Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további információért.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Adj egy nevet e lemezhez, mint például 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Tégy be egy lemezt a meghajtóba és üss enter-t"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Ismételd meg e folyamatot készleted többi CD-jével is."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Az argumentumok nincsenek párban"
@@ -291,7 +305,7 @@ 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-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
@@ -325,7 +339,6 @@ msgid "Error processing contents %s"
msgstr "Hiba %s tartalmának feldolgozásakor"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -378,13 +391,13 @@ msgstr ""
"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n"
"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n"
"\n"
-"Az apt-ftparchive 'Package' fájlokat generál a .deb-ek fájából. A Package\n"
+"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n"
"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n"
"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n"
"Prioritás és Szekció mezők értékének kényszerítésére.\n"
"\n"
-"Hasonlóképpen az apt-ftparchive 'Sources' fájlokat generál .dsc-k fájából.\n"
-"A --source-override opció használható forrásfelülbíráló fájlok megadására\n"
+"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n"
+"A --source-override opció használható forrás-felülbíráló fájlok megadására\n"
"\n"
"A 'packages' és 'sources' parancsokat a fa gyökeréből kell futtatni.\n"
"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatni és\n"
@@ -392,12 +405,12 @@ msgstr ""
"előtag\n"
"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
"a\n"
-"debian archívumból:\n"
+"Debian archívumból:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
"Opciók:\n"
-" -h Ez a súgó szöveg\n"
+" -h E súgó szöveg\n"
" --md5 MD5 generálás vezérlése\n"
" -s=? Forrás felülbíráló fájl\n"
" -q Szűkszavú mód\n"
@@ -416,115 +429,126 @@ msgstr "Nincs illeszkedő kiválasztás"
msgid "Some files are missing in the package file group `%s'"
msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB megsérült, a fájl átnevezve %s.old-ra"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB régi, megkísérlem frissíteni erre: %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "A fájl dátuma megváltozott %s"
+msgid "Failed to stat %s"
+msgstr "%s elérése sikertelen"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Az archívumnak nincs vezérlő rekordja"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "F: %s nem érhető el\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "F: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "H: Hibás a fájl "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
-msgstr "Nem sikerült feloldani a következőt: %s"
+msgstr "Nem sikerült feloldani ezt: %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Fabejárás nem sikerült"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "%s megnyitása sikertelen"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s linkelése ehhez: %s sikertelen"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink elérte %sB korlátját.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s elérése sikertelen"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -613,392 +637,407 @@ msgstr "Olvasási hiba az MD5 kiszámításakor"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr "Probléma %s unlinkelésekor"
+msgstr "Hiba %s elláncolásakor"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Nem sikerült átnevezni a következőt: %s erre: %s"
+msgstr "Nem sikerült átnevezni %s-t erre: %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
-msgstr "A következő csomagoknak teljesítetlen függőségei vannak:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " vagy"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr "A következő ÚJ csomagok lesznek telepítve:"
+msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr "A következÅ‘ csomagok el lesznek TÃVOLÃTVA:"
+msgstr "Az alábbi csomagok el lesznek TÃVOLÃTVA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr "A következő csomagok vissza lesznek tartva:"
+msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr "A következő csomagok frissítve lesznek:"
+msgstr "Az alábbi csomagok frissítve lesznek:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
-msgstr "A következő csomagok VISSZA lesznek fejlesztve:"
+msgstr "Az alábbi csomagok ÖREGBÃTÉSRE kerülnek:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
-msgstr "A következő visszatartott csomagok fel lesznek váltva:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n"
-"Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!"
+"FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n"
+"NE tedd ezt, míg nem tudod pontosan, mit csinálsz!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, "
+msgstr "%lu frissített, %lu újonnan telepített, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
-msgstr "%lu újra lesz telepítve, "
+msgstr "%lu újratelepítendő, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
-msgstr "%lu vissza lesz fejlesztve, "
+msgstr "%lu kerül öregbítésre, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu el lesz távolítva és %lu nem lesz frissítve.\n"
+msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n"
+msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Függőségek javítása..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " sikertelen."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nem lehet javítani a függőségeket"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Kész"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Teljesítetlen függőségek. Próbáld a -f használatával."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!"
+msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "A hitelesítési figyelmeztetést átléptem.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? "
+msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Néhány csomag nem hitelesíthető"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Belső hiba egy eltérítés hozzáadásakor"
+msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Az archívumokból %sB/%sB-t kell letölteni.\n"
+msgstr "Letöltendő az archívumokból: %sB/%sB\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "%sB-t kell letölteni az archívumokból.\n"
+msgstr "Letöltés az archívumokból: %sB\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n"
+msgstr "Kicsomagolás után %sB lemezterületet használok fel\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n"
+msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Nincs elég szabad hely itt: %s"
+msgstr "Nem határozható meg a szabad hely itt: %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "Nincs elég szabad hely itt: %s."
+msgstr "Nincs elég szabad hely itt: %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Ãrtalmasnak tűnÅ‘ műveletet készülsz végrehajtani\n"
-"A folytatáshoz írd be a következő kifejezést '%s'\n"
+"Ãrtalmasnak tűnÅ‘ műveletet készülsz végrehajtani.\n"
+"A folytatáshoz írd be ezt: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Megszakítva."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Nem sikerült letölteni a következőt: %s %s\n"
+msgstr "Sikertelen letöltés: %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
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:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et "
-"vagy a --fix-missing -et."
+"Nem lehet letölteni néhány archívumot.\n"
+" Próbáld ki az apt-get update -et vagy a --fix-missing -et."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing és a média csere még nem támogatott"
+msgstr "--fix-missing és média csere jelenleg nem támogatott"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nem lehet javítani a hiányzó csomagokat."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Telepítés megszakítása."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "A(z) %s csomag nincs telepítve, így nem távolítható el\n"
+msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "A(z) %s egy virtuális csomag, amit a következő szolgáltat:\n"
+msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Telepítve]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr "Egyet határozottan ki kell választanod telepítésre."
+msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"A(z) %s csomagnak nincs elérhető verziója, de egy másik csomag\n"
-"hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n"
-"vagy csak más forrásból érhető el\n"
+"%s csomag nem elérhető, de egy másik hivatkozik rá\n"
+".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
-msgstr "Azonban a következő csomagok felváltják:"
+msgstr "De az alábbi csomagok felváltják:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez"
+msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s már a legújabb verzió.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' kiadás ehhez: '%s' nem található"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' verzió ehhez: '%s' nem található"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a "
-"régi változatuk lesz használva."
+"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi "
+"változatukat használom."
+
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Belső hiba, hibafeloldó gond"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
-msgstr "Nem található a(z) %s csomag"
+msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :"
+msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1045,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1018,7 +1057,7 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1028,118 +1067,118 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "A következő információ talán segít megoldani a helyzetet:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "A következő extra csomagok kerülnek telepítésre:"
+msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Belső hiba, AllUpgrade megsértett valamit"
+msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, 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:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%sB/%sB forrásarchívot kell letölteni.\n"
+msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "%sB forrásarchívumot kell letölteni.\n"
+msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, 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:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1148,41 +1187,41 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
-"verziókövetelményt kielégítő elérhető verziója."
+"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1350,8 +1389,7 @@ msgstr "vagy hiányzó függÅ‘ségek miatti hibákat. Ez így OK, csak az ezen Ã
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"előtti hibák fontosak. Kérem javítsa azokat és futtassa az [I]nstallt újra"
+msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra"
#: dselect/update:30
msgid "Merging available information"
@@ -1361,19 +1399,19 @@ msgstr "Elérhető információk egyesítése"
msgid "Failed to create pipes"
msgstr "Nem sikerült csöveket létrehozni"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Nem sikerült a gzipet futtatni "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Hibás archívum"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag"
@@ -1384,11 +1422,11 @@ msgstr "Érvénytelen archívum-aláírás"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr "Hiba az archívtag-fejléc olvasásakor"
+msgstr "Hiba az archívum tag fejléc olvasásakor"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "Érvénytelen archívtag-fejléc"
+msgstr "Érvénytelen archívum tag fejléc"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
@@ -1400,7 +1438,7 @@ msgstr "Nem sikerült olvasni az archívum fejléceket"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr "DropNode hívása egy még mindig kapcsolódó node-ra történt"
+msgstr "DropNode hívása egy még mindig láncolt node-ra történt"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
@@ -1430,11 +1468,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dupla %s/%s konfigurációs fájl"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Nem sikerült a(z) %s fájlba írni"
+msgstr "%s fájl írása sikertelen"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Nem sikerült a(z) %s fájlt bezárni"
@@ -1487,10 +1525,11 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
-msgstr "A(z) %s nem olvasható"
+msgstr "%s nem olvasható"
#: apt-inst/extract.cc:494
#, c-format
@@ -1514,12 +1553,12 @@ msgstr "%sinfo nem érhető el"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Az info és temp könyvtáraknak ugyanazon a fájlrendszeren kell lenniük"
+msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Csomaglisták olvasása"
@@ -1533,7 +1572,7 @@ msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani"
msgid "Internal error getting a package name"
msgstr "Belső hiba a csomagnév elhozásakor"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Fájllista olvasása"
@@ -1578,21 +1617,17 @@ msgstr "Belső hiba egy eltérítés hozzáadásakor"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr "A csomag gyorsítótárnak előbb kell inicializálva lennie"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Fájllista olvasása"
+msgstr "A csomag gyorstárnak előbb kell inicializálva lennie"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Nem sikerült megtalálni a csomag-fejlécet, offszet %lu"
+msgstr "Nem találom a csomag-fejlécet, offszet %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Hibás ConfFile szekció a státusz fájlban. Offszet %lu"
+msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
@@ -1607,8 +1642,7 @@ msgstr "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Ez nem egy érvényes DEB archív, hiányzik a(z) \"%s\" vagy a(z) \"%s\" tag"
+msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1647,27 +1681,24 @@ msgstr "Hibás CD"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Nem lehet leválasztani a(z) %s meghajtóban levő CD-ROM-ot, talán még "
-"használod."
+msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Nem találom a fájlt"
+msgstr "Nem találom a lemezt"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nem találom a fájlt"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Nem sikerült beállítani a módosítási időt"
+msgstr "A módosítási időt beállítása sikertelen"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
@@ -1676,7 +1707,7 @@ msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr "Belépés"
+msgstr "Bejelentkezés a kiszolgálóra:"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
@@ -1689,17 +1720,17 @@ msgstr "Nem lehet a helyi nevet megállapítani"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "A kiszolgáló visszautasította a kapcsolatot, és azt mondta: %s"
+msgstr "A kiszolgáló megtagadta a kapcsolatot: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "Hibás USER, a kiszolgáló azt mondta: %s"
+msgstr "Hibás USER, a kiszolgáló üzenete: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "Hibás PASS, a kiszolgáló azt mondta: %s"
+msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
#: methods/ftp.cc:237
msgid ""
@@ -1712,12 +1743,12 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló azt mondta: %s"
+msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "Hibás TYPE, a kiszolgáló azt mondta: %s"
+msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
@@ -1749,8 +1780,7 @@ msgstr "Nem lehet létrehozni a socket-et"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időkeretet"
+msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1779,29 +1809,29 @@ msgstr "Nem lehet PORT parancsot küldeni"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "Ismeretlen a(z) %u címcsalád (AF_*)"
+msgstr "Ismeretlen %u címcsalád (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "Hibás EPRT, a kiszolgáló azt mondta: %s"
+msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
+msgstr "Az adat sockethez kapcsolódás túllépte az időt"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Nem lehet letölteni a fájlt, a kiszolgáló azt mondta '%s'"
+msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
@@ -1810,21 +1840,21 @@ msgstr "Az adat socket túllépte az időt"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Adatátvitel sikertelen, a kiszolgáló azt mondta '%s'"
+msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
msgstr "Lekérdezés"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Nem lehet meghívni "
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "Csatlakozás a következőhöz: %s (%s)"
+msgstr "Csatlakozás: %s (%s)"
#: methods/connect.cc:71
#, c-format
@@ -1834,87 +1864,87 @@ msgstr "[IP: %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "socket létrehozása sikertelen a következőhöz: %s (f=%u t=%u p=%u)"
+msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Kapcsolat létrehozása sikertelen a következőhöz: %s: %s (%s)."
+msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "Nem lehet kapcsolódni a következőhöz: %s: %s (%s)."
+msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr "Kapcsolódás a következőhöz: %s"
+msgstr "Kapcsolódás: %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nem lehet feloldani a következőt: '%s' "
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Ãtmeneti hiba '%s' feloldása közben"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr "Nem lehet kapcsolódni következőhöz: %s %s:"
+msgstr "Sikertelen kapcsolódás ide: %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "%s kulcstartó nem érhető el"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "1 vagy több érvénytelen aláírást találtam."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nem sikerült zárolni: %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gnupg telepítve van?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "A következő extra csomagok kerülnek telepítésre:"
+msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1924,78 +1954,78 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr "Olvasási hiba a(z) %s folyamattól"
+msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr "Kapcsolódás sikertelen"
+msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Belső hiba"
@@ -2009,10 +2039,10 @@ msgstr "Nem lehet mmap-olni egy üres fájlt"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr "A(z) %s kiválasztás nem található"
+msgstr "%s kiválasztás nem található"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
@@ -2062,7 +2092,7 @@ msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előrás"
+msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
@@ -2114,7 +2144,7 @@ msgstr "%s opció egész és nem %s típusú argumentumot követel meg"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "A(z) %s opció túl hosszú"
+msgstr "Túl hosszú %s opció"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
@@ -2129,12 +2159,12 @@ msgstr "%s érvénytelen művelet"
#: apt-pkg/contrib/cdromutl.cc:55
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "%s csatlakoztatási pont nem érhető el"
+msgstr "%s csatolási pont nem érhető el"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr "Nem sikerült a következőre váltani: %s"
+msgstr "Nem sikerült ide váltani: %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
@@ -2197,27 +2227,27 @@ msgstr "írás, még kiírandó %lu de ez nem lehetséges"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr "Probléma a fájl bezárásakor"
+msgstr "Hiba a fájl bezárásakor"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr "Probléma a fájl unlinkelésével"
+msgstr "Hiba a fájl leválasztásával"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr "Probléma a fájl szinkronizálásakor"
+msgstr "Hiba a fájl szinkronizálásakor"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr "Üres csomaggyorsítótár"
+msgstr "Üres csomag-gyorstár"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr "A csomaggyorsítótár-fájl megsérült"
+msgstr "A csomag-gyorstár fájl megsérült"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú"
+msgstr "A csomag-gyorstár fájl inkompatibilis verziójú"
#: apt-pkg/pkgcache.cc:142
#, c-format
@@ -2226,7 +2256,7 @@ msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert"
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr "A csomaggyorsítótár egy másik architektúrához készült"
+msgstr "A csomag-gyorstár egy másik architektúrához készült"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
@@ -2276,74 +2306,89 @@ msgstr "opcionális"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Függőségi fa építése"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Lehetséges verziók"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+msgstr "Függőség-generálás"
+
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Elérhető információk egyesítése"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s megnyitása sikertelen"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s fájl írása sikertelen"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú %s forráslistában."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
+msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
@@ -2364,25 +2409,25 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "A(z) '%s' indexfájltípus nem támogatott"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot."
+msgstr ""
+"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott "
+"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-"A problémák nem javíthatók, sérült visszatartott csomagok vannak a "
-"rendszeren."
+"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
#: apt-pkg/acquire.cc:62
#, c-format
@@ -2394,10 +2439,17 @@ msgstr "%spartial listakönyvtár hiányzik."
msgid "Archive directory %spartial is missing."
msgstr "%spartial archívumkönyvtár hiányzik."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li/%li fájl letöltése (%s marad)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li/%li fájl letöltése"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2409,22 +2461,19 @@ msgstr "A(z) %s metódus vezérlő nem található."
msgid "Method %s did not start correctly"
msgstr "A(z) %s metódus nem indult el helyesen"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Kérlek tedd be a(z)\n"
-" %s\n"
-"címkéjű lemezt a(z) %s meghajtóba és üss entert\n"
+msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) '%s' csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
-msgstr "A megfelelő csomagrendszer típusa nem határozható meg"
+msgstr "A megfelelő csomagrendszer típus nem határozható meg"
#: apt-pkg/clean.cc:61
#, c-format
@@ -2433,7 +2482,7 @@ msgstr "%s nem érhető el."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Néhány 'source' URI-t bele kell tenned a sources.list fájlodba"
+msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2442,8 +2491,7 @@ msgstr ""
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Próbáld futtatni az apt-get update -et, hogy javítsd ezeket a problémákat"
+msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
@@ -2458,87 +2506,87 @@ msgstr "A(z) %s tűtípus nem értelmezhető"
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)"
+msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)"
+msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)"
+msgstr "Hiba történt %s feldolgozásakor (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)"
+msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)"
+msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)"
+msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
# FIXME
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
@@ -2547,36 +2595,40 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
+"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
+"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2591,8 +2643,8 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-"%s CD-ROM csatlakoztatási pont használata\n"
-"CD-ROM csatlakoztatása\n"
+"%s CD-ROM csatolási pont használata\n"
+"CD-ROM csatolása\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
@@ -2606,7 +2658,7 @@ msgstr "Tárolt címke: %s \n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "%s CD-ROM csatlakoztatási pont használata\n"
+msgstr "%s CD-ROM csatolási pont használata\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
@@ -2619,7 +2671,7 @@ msgstr "Várakozás a lemezre...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM csatlakoztatása...\n"
+msgstr "CD-ROM felcsatolása...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
@@ -2632,7 +2684,7 @@ msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr "Ez a név érvénytelen, próbálja újra.\n"
+msgstr "E név érvénytelen, próbáld újra.\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2640,7 +2692,7 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"Ezen lemez neve: \n"
+"E lemez neve: \n"
"%s\n"
#: apt-pkg/cdrom.cc:730
@@ -2653,7 +2705,7 @@ msgstr "Új forráslista írása\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr "Ezen lemezhez tartozó forráslista-bejegyzések a következők:\n"
+msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
@@ -2680,55 +2732,90 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "%s megnyitása"
+msgstr "%s előkészítése"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "%s megnyitása"
+msgstr "%s kicsomagolása"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "%s konfigurációs fájl megnyitása"
+msgstr "%s konfigurálásának előkészítése"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Kapcsolódás a következőhöz: %s"
+msgstr "%s konfigurálása"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Telepítve: "
+msgstr "Telepített %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s eltávolításának előkészítése"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "%s megnyitása"
+msgstr "%s eltávolítása"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Ajánlja"
+msgstr "Eltávolított %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "%s teljes eltávolítása előkészítése"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "%s teljesen eltávolítva"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr "A kapcsolat idő előtt befejeződött"
+msgstr "A kapcsolat idő előtt lezárult"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "A fájl dátuma megváltozott %s"
+
+#~ msgid "Total Distinct Descriptions: "
+#~ msgstr "Összes külső leírás: "
+
+#~ msgid "Total Desc/File relations: "
+#~ msgstr "Összes Leírás/Fájl kapcsolat: "
+
+#~ msgid "Reading file list"
+#~ msgstr "Fájllista olvasása"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nem futtatható"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
+
+#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#~ msgstr ""
+#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni "
+#~ "tud!"
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s konfigurálásával eltávolítva"
+
+#~ msgid "Could not patch file"
+#~ msgstr "%s fájl foltozása sikertelen"
diff --git a/po/it.po b/po/it.po
index aee5acc04..849e52234 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-10-05 17:38+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-02-14 11:41+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
@@ -84,11 +84,11 @@ msgstr "Totale spazio occupato: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Il file dei pacchetti %s è desincronizzato."
+msgstr "Il file dei pacchetti %s non è sincronizzato."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "Bisogna dare solamente un pattern"
+msgstr "Bisogna specificare un singolo pattern"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
@@ -101,7 +101,7 @@ msgstr "File dei pacchetti:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"La cache è desincronizzata, impossibile referenziare un file di pacchetti"
+"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -145,14 +145,14 @@ msgstr " Tabella versione:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per %s %s compilato il %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,18 @@ msgstr ""
"Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori "
"informazioni\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Inserire un disco nel drive e premere invio"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Ripetere questo processo per il resto dei CD."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argomenti non in coppia"
@@ -290,7 +302,7 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -373,7 +385,7 @@ msgstr ""
" clean config\n"
"\n"
"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici a alternative "
+"molti stili di generazione da completamente automatici a alternative\n"
"funzionali per dpkg-scanpackages e dpkg-scansources\n"
"\n"
"apt-ftparchive genera file Packages da un albero di .deb. Il\n"
@@ -382,12 +394,12 @@ msgstr ""
"è supportato per forzare il valore di Priorità e Sezione.\n"
"\n"
"Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override può essere usata per specificare un file di "
-"override per i sorgenti\n"
+"L'opzione --source-override può essere usata per specificare un file\n"
+"di override per i sorgenti\n"
"\n"
-"I comandi 'packages' e 'sources' devono essere seguiti nella root \n"
+"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n"
"dell'albero. BinaryPath deve puntare alla base della ricerca \n"
-"ricorsiva e il file override devecontenere le opzioni di override. "
+"ricorsiva e il file override deve contenere le opzioni di override.\n"
"Pathprefix è\n"
" aggiunto al campo filename se presente. Esempio di utilizzo \n"
"dall'archivio debian:\n"
@@ -414,115 +426,126 @@ msgstr "Nessuna selezione corrisponde"
msgid "Some files are missing in the package file group `%s'"
msgstr "Mancano alcuni file nel file group di pacchetti `%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB era corrotto, il file è stato rinominato in %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Il DB è vecchio, tentativo di aggiornamento %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Impossibile aprire il file DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "La data del file è cambiata %s"
+msgid "Failed to stat %s"
+msgstr "Impossibile analizzare %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr "L'Archivio non ha un campo control"
+msgstr "L'archivio non ha un campo control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossibile ottenere un cursore"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossibile leggere la directory %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossibile analizzare %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Errori applicati al file "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossibile risolvere %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Visita dell'albero fallita"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Impossibile aprire %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossibile eseguire readlink su %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossibile eseguire unlink su %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossibile eseguire link tra %s e %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limite di %sB raggiunto.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Impossibile analizzare %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantainer è %s non %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s non ha un campo override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s non ha un campo override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -581,12 +604,12 @@ msgstr "Impossibile eseguire fork"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr "Figlio compresso"
+msgstr "Sottoprocesso compresso"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Errore interno, Impossibile creare %s"
+msgstr "Errore interno, impossibile creare %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
@@ -618,79 +641,79 @@ msgstr "Problema nell'unlink di %s"
msgid "Failed to rename %s to %s"
msgstr "Impossibile rinominare %s in %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ma %s è installato"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ma %s sta per essere installato"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ma è un pacchetto virtuale"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ma non è installato"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " oppure"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -699,149 +722,149 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi (downgraded), "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Correzione delle dipendenze in corso..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " fallita."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossibile correggere le dipendenze"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossibile minimizzare l'insieme da aggiornare"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Fatto"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"È consigliabile eseguire `apt-get -f install' per correggere questi problemi."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dipendenze non trovate. Riprovare usando -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Avviso di autenticazione disabilitato \n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installare questi pacchetti senza la verifica [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Non è stato possibile autenticare alcuni pacchetti"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non è terminato"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non può essere letta."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Che strano... le dimensioni non corrispondono, inviare un'email a "
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "È necessario prendere %sB/%sB di archivi. \n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "È necessario prendere %sB di archivi. \n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Lo spazio libero in %s non è sufficente."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"È stata specificata la modalità Trivial Only ma questa non è un'operazione "
"triviale"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "SI, esegui come richiesto!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -852,28 +875,28 @@ msgstr ""
"Per continuare scrivere la frase '%s' \n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Interrotto."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Il download di alcuni file è fallito"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalità download-only"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -881,103 +904,102 @@ msgstr ""
"Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update "
"o provare l'opzione --fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing su media estraibili non è ancora supportato"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Interruzione dell'installazione in corso."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, si sta selezionando %s al posto di %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s è stato saltato, perché è già installato e l'aggiornamento non è stato "
"impostato.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Il pacchetto %s non è installato, quindi non è stato rimosso\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installato]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Bisogna esplicitamente sceglierne uno da installare."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma ma è nominato da un "
-"altropacchetto.\n"
-" Questo significa che il pacchetto manca, è diventato obsoletoo è "
-"disponibile solo all'interno di un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
+"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
+"o è disponibile solo all'interno di un'altra sorgente\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Comunque il seguente pacchetto lo sostituisce:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Il pacchetto %s non ha candidati da installare"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstallazione di %s non è possibile, non può esssere scaricato.\n"
+msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s è già alla versione più recente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non è stata trovata la release '%s' per '%s'"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non è stata trovata la versione '%s' per '%s'"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione selezionata %s (%s) per %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossibile creare un lock sulla directory di list"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -985,26 +1007,45 @@ msgstr ""
"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
"si useranno quelli precedenti."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Errore interno, problem resolver ha rotto qualcosa"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1012,7 +1053,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1024,126 +1065,127 @@ msgstr ""
"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
"richiesti non sono ancora stati creati o rimossi da incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Poichè è stata richiesta solo una singola operazione è molto facile che\n"
+"Poiché è stata richiesta solo una singola operazione è molto facile che\n"
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
-msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente"
+msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Si è saltato il file già scaricato '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non è sufficente"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Non è stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
"dipendenze"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1194,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1203,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
"del pacchetto %s può soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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 nuovo"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s è fallita"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione è fallito"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1374,19 +1416,19 @@ msgstr "Aggiornamento delle informazioni disponibili"
msgid "Failed to create pipes"
msgstr "Impossibile creare delle pipe"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Impossibile eseguire gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Archivio corrotto"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Checksum di tar fallito, archivio corrotto"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo %u nell'header del tar sconosciuto, member %s"
@@ -1448,7 +1490,7 @@ msgstr "File di configurazione duplice %s/%s"
msgid "Failed to write file %s"
msgstr "Impossibile scrivere il file %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Chiusura del file %s fallita"
@@ -1502,7 +1544,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -1532,9 +1575,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Le directory temp e info devono essere sullo stesso filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lettura della lista dei pacchetti in corso"
@@ -1548,7 +1591,7 @@ msgstr "Impossibile raggiungere la directory admin %sinfo"
msgid "Internal error getting a package name"
msgstr "Errore interno nel prendere un nome di un pacchetto"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Lettura della lista dei file in corso"
@@ -1595,10 +1638,6 @@ msgstr "Errore interno nell'aggiunta di una diversion"
msgid "The pkg cache must be initialized first"
msgstr "La cache dei pacchetti deve prima essere inizializzata"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lettura della lista dei file in corso"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1671,12 +1710,12 @@ msgstr "Disco non trovato"
msgid "File not found"
msgstr "File non trovato"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Impossibile analizzare"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Impossibile impostare la data di modifica (modification time)"
@@ -1805,7 +1844,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1828,7 +1867,7 @@ msgstr "Trasferimento dei dati fallito, il server ha detto '%s'"
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Impossibile invocare "
@@ -1858,72 +1897,73 @@ msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Impossibile connettersi a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connessione a %s in corso"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Impossibile risolvere '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "risoluzione di '%s' temporaneamete fallita"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "È accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Impossibile connettersi a %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Impossibile risolvere '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Errore interno: Firma corretta, ma non è stato possibile determinare il "
"fingerprint della chiave?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "Almeno una firma non valida è stata trovata."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Impossibile eseguire "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr " per verificare la firma (gnugp è installato?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1941,77 +1981,77 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Si è ottenuto una singola linea di header su %u caratteri"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Errore interno"
@@ -2024,7 +2064,7 @@ msgstr "Impossibile eseguire mmap su un file vuoto"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossibile eseguire mmap di %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -2149,7 +2189,7 @@ msgstr "Operazione non valida %s"
msgid "Unable to stat the mount point %s"
msgstr "Impossibile accedere al mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossibile raggiungere %s"
@@ -2295,74 +2335,89 @@ msgstr "opzionale"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Generazione dell'albero delle dipendenze in corso"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versioni candidate"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generazione delle dipendenze"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Aggiornamento delle informazioni disponibili"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossibile aprire %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Impossibile scrivere il file %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La linea %lu in %s (URI) non è corretta"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La linea %lu in %s (dist) non è corretta"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La linea %lu in %s (URI parse) non è corretta"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non è corretta"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La linea %lu in %s (dist parse) non è corretta"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s in corso"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linea %u troppo lunga nel source list %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La linea %u in %s (type) non è corretta"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Il tipo '%s' non è riconosciuto alla linea %u nella lista sorgente %s"
+msgstr "Il tipo '%s' non è riconosciuto alla linea %u nella lista sorgenti %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La linea %u in %s (vendor id) non è corretta"
@@ -2383,7 +2438,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Il file indice di tipo '%s' non è supportato"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2391,7 +2446,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
"archivio per esso."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2399,7 +2454,7 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere "
"causato da pacchetti bloccati "
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
@@ -2413,11 +2468,18 @@ msgstr "Manca la directory di liste %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Manca la directory di archivio %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Scaricamento del file %li di %li (%s rimanente)"
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lettura della lista dei file in corso"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2428,19 +2490,19 @@ msgstr "Non è stato possibile trovare un driver per il metodo %s."
msgid "Method %s did not start correctly"
msgstr "Il metodo %s non è partito correttamente"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
"invio."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2475,89 +2537,89 @@ msgstr "Impossibile capire il tipo di pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nessuna (o zero) priorità specificata per il pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "La cache ha un sistema incompatibile di gestione delle versioni"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Errore nell'analisi di %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Errore nell'analisi di %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Errore nell'analisi di %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Errore nell'analisi di %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Errore nell'analisi di %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Errore nell'analisi di %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Errore nell'analisi di %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"WOW, si è ecceduto il numero massimo di nomi di pacchetti che questo APT è "
"capace di gestire"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"WOW, si è ecceduto il numero massimo di versioni che questo APT è capace di "
"gestire"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"WOW, si è ecceduto il numero massimo di dipendenze che questo APT è capace "
"di gestire"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Errore nell'analisi di %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Errore nell'analisi di %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"È stato impossibile trovare %s %s mentre si processava le dipendenze dei file"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Il File Collezionato Fornisce"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvataggio del cache sorgente"
@@ -2566,11 +2628,16 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2580,7 +2647,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2589,7 +2656,7 @@ msgstr ""
"Non è stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2597,7 +2664,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2741,278 +2808,30 @@ msgid "Removed %s"
msgstr "%s rimosso"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Preparazione per la rimozione con la configurazione %s in corso"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparazione alla configurazione di %s in corso"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Rimosso con la configurazione %s"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Impossibile rimuovere %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-#~ msgid "Write Error"
-#~ msgstr "Errore di Scrittura"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto"
-
-#~ msgid "File Not Found"
-#~ msgstr "File Non Trovato"
-
-#~ msgid ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run `apt-get -f install' to correct these."
-#~ msgstr ""
-#~ "Sono stati trovati dei pacchetti con errori mentre si cercava di "
-#~ "cotruire\n"
-#~ "le dipendenze. Si consiglia di eseguire `apt-get -f install` per "
-#~ "correggerli."
-
-#~ msgid "<- '"
-#~ msgstr "<- '"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "-> '"
-#~ msgstr "-> '"
-
-#~ msgid "Followed conf file from "
-#~ msgstr "Si Ú seguito il file di configurazione da "
-
-#~ msgid " to "
-#~ msgstr " a "
-
-#~ msgid "Extract "
-#~ msgstr "Estratto "
-
-#~ msgid "Aborted, backing out"
-#~ msgstr "Abortito, ripristino in corso"
-
-#~ msgid "De-replaced "
-#~ msgstr "Non sostituito"
+#~ msgid "File date has changed %s"
+#~ msgstr "La data del file è cambiata %s"
-#~ msgid " from "
-#~ msgstr " da "
+#~ msgid "Reading file list"
+#~ msgstr "Lettura della lista dei file in corso"
-#~ msgid "Backing out "
-#~ msgstr "Ripristino in corso "
+#~ msgid "Could not execute "
+#~ msgstr "Impossibile eseguire "
-#~ msgid " [new node]"
-#~ msgstr " [nuovo nodo]"
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso"
-#~ msgid "Replaced file "
-#~ msgstr "File sostituito "
-
-#~ msgid "Internal Error, Unable to parse a package record"
-#~ msgstr "Errore interno, Impossibile analizzare un campo del pacchetto"
-
-#~ msgid "Unimplemented"
-#~ msgstr "Non Implementato"
-
-#~ msgid "You must give at least one file name"
-#~ msgstr "Bisogna dare almeno un nome di un file"
-
-#~ msgid "Generating cache"
-#~ msgstr "Generazione cache in corso"
-
-#~ msgid "Problem with SelectFile"
-#~ msgstr "Problemi con SelectFile"
-
-#~ msgid "Problem with MergeList"
-#~ msgstr "Problemi con MergeList"
-
-#~ msgid "Regex compilation error"
-#~ msgstr "Errore nella compilazione della regex"
-
-#~ msgid "Write to stdout failed"
-#~ msgstr "Scrittura su stdout fallita"
-
-#~ msgid "Generate must be enabled for this function"
-#~ msgstr "Generate deve essere abilitata per questa funzione"
-
-#~ msgid "Failed to stat %s%s"
-#~ msgstr "Impossibile analizzare %s%s"
-
-#~ msgid "Failed to open %s.new"
-#~ msgstr "Impossibile aprire %s.new"
-
-#~ msgid "Failed to rename %s.new to %s"
-#~ msgstr "Impossibile rinominare %s.new in %s"
-
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Inserire un disco nel drive e premere invio"
-
-#~ msgid "I found (binary):"
-#~ msgstr "Trovati (binary):"
-
-#~ msgid "I found (source):"
-#~ msgstr "Trovati (source):"
-
-#~ msgid "Found "
-#~ msgstr "Trovato "
-
-#~ msgid " source indexes."
-#~ msgstr " sorgenti indicizzati."
-
-#~ msgid ""
-#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian"
-
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
-
-#~ msgid " '"
-#~ msgstr " '"
-
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr "Ripetere questo processo per il resto dei CD."
-
-#~ msgid ""
-#~ "Usage: apt-cdrom [options] command\n"
-#~ "\n"
-#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-#~ "CDROM mount point and device information is taken from apt.conf\n"
-#~ "and /etc/fstab.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ " add - Add a CDROM\n"
-#~ " ident - Report the identity of a CDROM\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " -h This help text\n"
-#~ " -d CD-ROM mount point\n"
-#~ " -r Rename a recognized CD-ROM\n"
-#~ " -m No mounting\n"
-#~ " -f Fast mode, don't check package files\n"
-#~ " -a Thorough scan mode\n"
-#~ " -c=? Read this configuration file\n"
-#~ " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See fstab(5)\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-cdrom [opzioni] comando\n"
-#~ "\n"
-#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n"
-#~ "mount point del CDROM e l'informazione della periferica sono presi da apt."
-#~ "conf\n"
-#~ "e /etc/fstab.\n"
-#~ "\n"
-#~ "Comandi:\n"
-#~ " add - Aggiunge un CDROM\n"
-#~ " ident - riporta l'identità di un CDROM\n"
-#~ "\n"
-#~ "Opzioni:\n"
-#~ " -h Questo help\n"
-#~ " -d Mount point del CDROM\n"
-#~ " -r Rinomina un CDROM riconosciuto\n"
-#~ " -m Nessun montaggio\n"
-#~ " -f Modalità veloce, non controlla i file dei pacchetti\n"
-#~ " -a Scansione in modalità accurata\n"
-#~ " -c=? Legge come configurazione il file specificato\n"
-#~ " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
-#~ "Vedere fstab(5)\n"
-
-#~ msgid "Internal Error, non-zero counts"
-#~ msgstr "Errore interno, contatori non a zero"
-
-#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
-#~ msgstr ""
-#~ "Spiacente, spazio su disco insufficente in %s per tenere tutti i "
-#~ "pacchetti."
-
-#~ msgid "Couldn't wait for subprocess"
-#~ msgstr "Impossibile attendere il sottoprocesso"
-
-#~ msgid "....\"Have you mooed today?\"..."
-#~ msgstr "....\"Hai muggito oggi?\"..."
-
-#~ msgid " New "
-#~ msgstr " Nuovo "
-
-#~ msgid "B "
-#~ msgstr "B "
-
-#~ msgid " files "
-#~ msgstr " file "
-
-#~ msgid " pkgs in "
-#~ msgstr " pacchetti in "
-
-#~ msgid ""
-#~ "Usage: apt-ftparchive [options] command\n"
-#~ "Commands: packges binarypath [overridefile [pathprefix]]\n"
-#~ " sources srcpath [overridefile [pathprefix]]\n"
-#~ " contents path\n"
-#~ " generate config [groups]\n"
-#~ " clean config\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-ftparchive [opzioni] comando\n"
-#~ "Comandi: packges binarypath [overridefile [pathprefix]]\n"
-#~ " sources srcpath [overridefile [pathprefix]]\n"
-#~ " contents path\n"
-#~ " generate config [groups]\n"
-#~ " clean config\n"
-
-#~ msgid ""
-#~ "Options:\n"
-#~ " -h This help text\n"
-#~ " --md5 Control MD5 generation\n"
-#~ " -s=? Source override file\n"
-#~ " -q Quiet\n"
-#~ " -d=? Select the optional caching database\n"
-#~ " --no-delink Enable delinking debug mode\n"
-#~ " --contents Control contents file generation\n"
-#~ " -c=? Read this configuration file\n"
-#~ " -o=? Set an arbitary configuration option\n"
-#~ msgstr ""
-#~ "Opzioni:\n"
-#~ " -h Questo help\n"
-#~ " -md5 Generazione MD5 di controllo\n"
-#~ " -s=? file override per i sorgenti.\n"
-#~ " -q silenzioso\n"
-#~ " -d=? Seleziona il database opzionale per la cache\n"
-#~ " -no-delink Abilita la modalità di debug per il delink\n"
-#~ " -contents Generazione file contents di controllo\n"
-#~ " -c=? Legge come configurazione il file specificato\n"
-#~ " -o=? Imposta un'opzione di configurazione\n"
-
-#~ msgid "Done Packages, Starting contents."
-#~ msgstr "Packages terminato, Inizio i contents."
-
-#~ msgid "Hit contents update byte limit"
-#~ msgstr "Limite di byte per l'aggiornamento dei contents processati"
-
-#~ msgid "Done. "
-#~ msgstr "Fatto. "
-
-#~ msgid "B in "
-#~ msgstr "B in "
-
-#~ msgid " archives. Took "
-#~ msgstr " archivi. Sono occorsi"
-
-#~ msgid "B hit."
-#~ msgstr "B hit."
-
-#~ msgid " not "
-#~ msgstr " non "
-
-#~ msgid "DSC file '%s' is too large!"
-#~ msgstr "il file DSC '%s' Ú troppo largo!"
-
-#~ msgid "Could not find a record in the DSC '%s'"
-#~ msgstr "Impossibile trovare un campo nel DSC '%s'"
-
-#~ msgid "Error parsing file record"
-#~ msgstr "Errore nell'analisi del campo file"
-
-#~ msgid "Failed too stat %s"
-#~ msgstr "Impossibile anche analizzare %s"
-
-#~ msgid "Errors apply to file '%s'"
-#~ msgstr "Gli errori si applicano al file `%s'"
+#~ msgid "Removed with config %s"
+#~ msgstr "Rimosso con la configurazione %s"
diff --git a/po/ja.po b/po/ja.po
index 4fa47b0e6..1d80bcc11 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,102 +8,102 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-09 12:54+0900\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-01-25 20:55+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8 bit\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Ð¡¼¥¸¥ç¥ó %s ¤Ë¤Ï²ò·èÉÔ²Äǽ¤Ê°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:\n"
+msgstr "パッケージ %s ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«ã¯è§£æ±ºä¸å¯èƒ½ãªä¾å­˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "パッケージ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô: "
+msgstr "パッケージåç·æ•°: "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
-msgstr " Ä̾ï¥Ñ¥Ã¥±¡¼¥¸: "
+msgstr " 通常パッケージ: "
#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
-msgstr " ½ã¿è²¾Áۥѥ屡¼¥¸: "
+msgstr " 純粋仮想パッケージ: "
#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
-msgstr " ñ°ì²¾Áۥѥ屡¼¥¸: "
+msgstr " å˜ä¸€ä»®æƒ³ãƒ‘ッケージ: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
-msgstr " Ê£¹ç²¾Áۥѥ屡¼¥¸: "
+msgstr " 複åˆä»®æƒ³ãƒ‘ッケージ: "
#: cmdline/apt-cache.cc:276
msgid " Missing: "
-msgstr " ·çÍî: "
+msgstr " 欠è½: "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr "¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô: "
+msgstr "個別ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç·æ•°: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr "°Í¸´Ø·¸Áí¿ô: "
+msgstr "ä¾å­˜é–¢ä¿‚ç·æ•°: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr "¥Ð¡¼¥¸¥ç¥ó/¥Õ¥¡¥¤¥ë´Ø·¸Áí¿ô: "
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³/ファイル関係ç·æ•°: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr "Ä󶡥ޥåԥó¥°Áí¿ô: "
+msgstr "æ供マッピングç·æ•°: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr "Glob ʸ»úÎó¤ÎÁí¿ô: "
+msgstr "Glob 文字列ã®ç·æ•°: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr "Áí°Í¸´Ø·¸¡¦¥Ð¡¼¥¸¥ç¥óÍÆÎÌ: "
+msgstr "ç·ä¾å­˜é–¢ä¿‚・ãƒãƒ¼ã‚¸ãƒ§ãƒ³å®¹é‡: "
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr "Áí¶õ¤­ÍÆÎÌ: "
+msgstr "ç·ç©ºã容é‡: "
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr "ÁíÀêÍ­ÍÆÎÌ: "
+msgstr "ç·å æœ‰å®¹é‡: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Package ¥Õ¥¡¥¤¥ë %s ¤¬Æ±´ü¤·¤Æ¤¤¤Þ¤»¤ó¡£"
+msgstr "Package ファイル %s ãŒåŒæœŸã—ã¦ã„ã¾ã›ã‚“。"
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "¥Ñ¥¿¡¼¥ó¤Ï¤Á¤ç¤¦¤É 1 ¤Ä¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
+msgstr "パターンã¯ã¡ã‚‡ã†ã© 1 ã¤ã ã‘指定ã—ã¦ãã ã•ã„"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "パッケージãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: cmdline/apt-cache.cc:1462
msgid "Package files:"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë:"
+msgstr "パッケージファイル:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "¥­¥ã¥Ã¥·¥å¤¬Æ±´ü¤·¤Æ¤ª¤é¤º¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÁê¸ß»²¾È¤Ç¤­¤Þ¤»¤ó"
+msgstr "キャッシュãŒåŒæœŸã—ã¦ãŠã‚‰ãšã€ãƒ‘ッケージファイルを相互å‚ç…§ã§ãã¾ã›ã‚“"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -113,48 +113,48 @@ msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
-msgstr "Pin ¥Ñ¥Ã¥±¡¼¥¸:"
+msgstr "Pin パッケージ:"
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
-msgstr "(¸«¤Ä¤«¤ê¤Þ¤»¤ó)"
+msgstr "(見ã¤ã‹ã‚Šã¾ã›ã‚“)"
#. Installed version
#: cmdline/apt-cache.cc:1515
msgid " Installed: "
-msgstr " ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: "
+msgstr " インストールã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³: "
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
-msgstr "(¤Ê¤·)"
+msgstr "(ãªã—)"
#. Candidate Version
#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
-msgstr " ¸õÊä: "
+msgstr " 候補: "
#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
-msgstr " ¥Ñ¥Ã¥±¡¼¥¸ Pin: "
+msgstr " パッケージ Pin: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
msgid " Version table:"
-msgstr " ¥Ð¡¼¥¸¥ç¥ó¥Æ¡¼¥Ö¥ë:"
+msgstr " ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ†ãƒ¼ãƒ–ル:"
#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s %s\n"
+msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -192,45 +192,58 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"»ÈÍÑÊýË¡: apt-cache [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
-" apt-cache [¥ª¥×¥·¥ç¥ó] add file1 [file2 ...]\n"
-" apt-cache [¥ª¥×¥·¥ç¥ó] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [¥ª¥×¥·¥ç¥ó] showsrc pkg1 [pkg2 ...]\n"
+"使用方法: apt-cache [オプション] コマンド\n"
+" apt-cache [オプション] add file1 [file2 ...]\n"
+" apt-cache [オプション] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [オプション] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"apt-cache ¤Ï APT ¤Î¥Ð¥¤¥Ê¥ê¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤òÁàºî¤·¤¿¤ê¡¢¤½¤³¤«¤é¾ð\n"
-"Êó¤ò¸¡º÷¤·¤¿¤ê¤¹¤ë¤¿¤á¤ÎÄã¥ì¥Ù¥ë¤Î¥Ä¡¼¥ë¤Ç¤¹\n"
+"apt-cache 㯠APT ã®ãƒã‚¤ãƒŠãƒªã‚­ãƒ£ãƒƒã‚·ãƒ¥ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ“作ã—ãŸã‚Šã€ãã“ã‹ã‚‰æƒ…\n"
+"報を検索ã—ãŸã‚Šã™ã‚‹ãŸã‚ã®ä½Žãƒ¬ãƒ™ãƒ«ã®ãƒ„ールã§ã™\n"
"\n"
-"¥³¥Þ¥ó¥É:\n"
-" add - ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ËÄɲ乤ë\n"
-" gencaches - ¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤òÀ¸À®¤¹¤ë\n"
-" showpkg - ñ°ì¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÈ̾ðÊó¤òɽ¼¨¤¹¤ë\n"
-" showsrc - ¥½¡¼¥¹¥ì¥³¡¼¥É¤òɽ¼¨¤¹¤ë\n"
-" stats - ´ðËÜ¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤òɽ¼¨¤¹¤ë\n"
-" dump - Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò´Êñ¤Ê·Á¼°¤Çɽ¼¨¤¹¤ë\n"
-" dumpavail - available ¥Õ¥¡¥¤¥ë¤òɸ½à½ÐÎϤ˽ÐÎϤ¹¤ë\n"
-" unmet - ̤²ò·è¤Î°Í¸´Ø·¸¤òɽ¼¨¤¹¤ë\n"
-" search - Àµµ¬É½¸½¥Ñ¥¿¡¼¥ó¤Ë¤è¤Ã¤Æ¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷¤¹¤ë\n"
-" show - ¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤òɽ¼¨¤¹¤ë\n"
-" depends - ¥Ñ¥Ã¥±¡¼¥¸¤¬°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òɽ¼¨¤¹¤ë\n"
-" rdepends - ¥Ñ¥Ã¥±¡¼¥¸¤ÎµÕ°Í¸¾ðÊó¤òɽ¼¨¤¹¤ë\n"
-" pkgnames - Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òɽ¼¨¤¹¤ë\n"
-" dotty - GraphVis ÍѤΥѥ屡¼¥¸¥°¥é¥Õ¤òÀ¸À®¤¹¤ë\n"
-" xvcg - xvcg ÍѤΥѥ屡¼¥¸¥°¥é¥Õ¤òÀ¸À®¤¹¤ë\n"
-" policy - ¥Ý¥ê¥·¡¼ÀßÄê¾ðÊó¤òɽ¼¨¤¹¤ë\n"
+"コマンド:\n"
+" add - パッケージファイルをソースキャッシュã«è¿½åŠ ã™ã‚‹\n"
+" gencaches - パッケージãŠã‚ˆã³ã‚½ãƒ¼ã‚¹ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚’生æˆã™ã‚‹\n"
+" showpkg - å˜ä¸€ãƒ‘ッケージã®ä¸€èˆ¬æƒ…報を表示ã™ã‚‹\n"
+" showsrc - ソースレコードを表示ã™ã‚‹\n"
+" stats - 基本ステータス情報を表示ã™ã‚‹\n"
+" dump - ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç°¡å˜ãªå½¢å¼ã§è¡¨ç¤ºã™ã‚‹\n"
+" dumpavail - available ファイルを標準出力ã«å‡ºåŠ›ã™ã‚‹\n"
+" unmet - 未解決ã®ä¾å­˜é–¢ä¿‚を表示ã™ã‚‹\n"
+" search - æ­£è¦è¡¨ç¾ãƒ‘ターンã«ã‚ˆã£ã¦ãƒ‘ッケージを検索ã™ã‚‹\n"
+" show - パッケージã®æƒ…報を表示ã™ã‚‹\n"
+" depends - パッケージãŒä¾å­˜ã—ã¦ã„るパッケージを表示ã™ã‚‹\n"
+" rdepends - パッケージã®é€†ä¾å­˜æƒ…報を表示ã™ã‚‹\n"
+" pkgnames - ã™ã¹ã¦ã®ãƒ‘ッケージåを表示ã™ã‚‹\n"
+" dotty - GraphVis 用ã®ãƒ‘ッケージグラフを生æˆã™ã‚‹\n"
+" xvcg - xvcg 用ã®ãƒ‘ッケージグラフを生æˆã™ã‚‹\n"
+" policy - ãƒãƒªã‚·ãƒ¼è¨­å®šæƒ…報を表示ã™ã‚‹\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" -p=? ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å\n"
-" -s=? ¥½¡¼¥¹¥­¥ã¥Ã¥·¥å\n"
-" -q ¥×¥í¥°¥ì¥¹É½¼¨¤ò¤·¤Ê¤¤\n"
-" -i umnet ¥³¥Þ¥ó¥É¤Ç½ÅÍפʰ͸¾ðÊó¤Î¤ß¤òɽ¼¨¤¹¤ë\n"
-" -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à\n"
-" -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òÆɤ߹þ¤à (Îã: -o dir::cache=/tmp)\n"
-"¾ÜºÙ¤Ï¡¢apt-cache(8) ¤ä apt.conf(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" -p=? パッケージキャッシュ\n"
+" -s=? ソースキャッシュ\n"
+" -q プログレス表示をã—ãªã„\n"
+" -i umnet コマンドã§é‡è¦ãªä¾å­˜æƒ…å ±ã®ã¿ã‚’表示ã™ã‚‹\n"
+" -c=? 指定ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€\n"
+" -o=? 指定ã—ãŸè¨­å®šã‚ªãƒ—ションを読ã¿è¾¼ã‚€ (例: -o dir::cache=/tmp)\n"
+"詳細ã¯ã€apt-cache(8) ã‚„ apt.conf(5) ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã«ã€'Debian 2.1r1 Disk 1' ã®ã‚ˆã†ãªåå‰ã‚’付ã‘ã¦ãã ã•ã„"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "ディスクをドライブã«å…¥ã‚Œã¦ enter を押ã—ã¦ãã ã•ã„"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+"ã‚ãªãŸã®æŒã£ã¦ã„ã‚‹ CD セットã®æ®‹ã‚Šå…¨éƒ¨ã«ã€ã“ã®æ‰‹é †ã‚’ç¹°ã‚Šè¿”ã—ã¦ãã ã•ã„。"
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "°ú¿ô¤¬¥Ú¥¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "引数ãŒãƒšã‚¢ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
#: cmdline/apt-config.cc:76
msgid ""
@@ -247,23 +260,23 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"»ÈÍÑÊýË¡: apt-config [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
+"使用方法: apt-config [オプション] コマンド\n"
"\n"
-"apt-config ¤Ï APT ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Î´Êñ¤Ê¥Ä¡¼¥ë¤Ç¤¹\n"
+"apt-config 㯠APT ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€ãŸã‚ã®ç°¡å˜ãªãƒ„ールã§ã™\n"
"\n"
-"¥³¥Þ¥ó¥É:\n"
-" shell - ¥·¥§¥ë¥â¡¼¥É\n"
-" dump - ÀßÄê¾ðÊó¤òɽ¼¨¤¹¤ë\n"
+"コマンド:\n"
+" shell - シェルモード\n"
+" dump - 設定情報を表示ã™ã‚‹\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n"
-" -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" -c=? 指定ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€\n"
+" -o=? 指定ã—ãŸè¨­å®šã‚ªãƒ—ションをé©ç”¨ã™ã‚‹(例: -o dir::cache=/tmp)\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr "%s ¤ÏÀµ¤·¤¤ DEB ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
+msgstr "%s ã¯æ­£ã—ã„ DEB パッケージã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -278,53 +291,52 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"»ÈÍÑÊýË¡: apt-extracttemplates ¥Õ¥¡¥¤¥ë̾1 [¥Õ¥¡¥¤¥ë̾2 ...]\n"
+"使用方法: apt-extracttemplates ファイルå1 [ファイルå2 ...]\n"
"\n"
-"apt-extracttemplates ¤Ï debian ¥Ñ¥Ã¥±¡¼¥¸¤«¤éÀßÄê¤È¥Æ¥ó¥×¥ì¡¼¥È¾ðÊó¤ò\n"
-"Ãê½Ð¤¹¤ë¤¿¤á¤Î¥Ä¡¼¥ë¤Ç¤¹\n"
+"apt-extracttemplates 㯠debian パッケージã‹ã‚‰è¨­å®šã¨ãƒ†ãƒ³ãƒ—レート情報を\n"
+"抽出ã™ã‚‹ãŸã‚ã®ãƒ„ールã§ã™\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" -t °ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ë\n"
-" -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n"
-" -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" -t 一時ディレクトリを指定ã™ã‚‹\n"
+" -c=? 指定ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€\n"
+" -o=? 指定ã—ãŸè¨­å®šã‚ªãƒ—ションをé©ç”¨ã™ã‚‹ (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
-msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó"
+msgstr "%s ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-"debconf ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£debconf ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¤«?"
+"debconf ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å–å¾—ã§ãã¾ã›ã‚“。debconf ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã‹?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
+msgstr "パッケージ拡張å­ãƒªã‚¹ãƒˆãŒé•·ã™ãŽã¾ã™"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
#, c-format
msgid "Error processing directory %s"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "ディレクトリ %s ã®å‡¦ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
-msgstr "¥½¡¼¥¹³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
+msgstr "ソース拡張å­ãƒªã‚¹ãƒˆãŒé•·ã™ãŽã¾ã™"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Contents ¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ø¥Ã¥À¤Î½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "Contents ファイルã¸ã®ãƒ˜ãƒƒãƒ€ã®æ›¸ãè¾¼ã¿ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr "Contents %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "Contents %s ã®å‡¦ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -365,826 +377,856 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"»ÈÍÑÊýË¡: apt-ftparchive [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
-"¥³¥Þ¥ó¥É: packages binarypath [overridefile [pathprefix]]\n"
+"使用方法: apt-ftparchive [オプション] コマンド\n"
+"コマンド: packages binarypath [overridefile [pathprefix]]\n"
" sources srcpath [overridefile [pathprefix]]\n"
" contents path\n"
" release path\n"
" generate config [groups]\n"
" clean config\n"
"\n"
-"apt-ftparchive ¤Ï Debian ¥¢¡¼¥«¥¤¥ÖÍѤΥ¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ\n"
-"¤¹¡£Á´¼«Æ°¤Î¤â¤Î¤«¤é¡¢dpkg-scanpackages ¤È dpkg-scansources ¤ÎÂåÂص¡Ç½\n"
-"¤È¤Ê¤ë¤â¤Î¤Þ¤Ç¡¢Â¿¤¯¤ÎÀ¸À®ÊýË¡¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£\n"
+"apt-ftparchive 㯠Debian アーカイブ用ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾\n"
+"ã™ã€‚全自動ã®ã‚‚ã®ã‹ã‚‰ã€dpkg-scanpackages 㨠dpkg-scansources ã®ä»£æ›¿æ©Ÿèƒ½\n"
+"ã¨ãªã‚‹ã‚‚ã®ã¾ã§ã€å¤šãã®ç”Ÿæˆæ–¹æ³•ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚\n"
"\n"
-"apt-ftparchive ¤Ï .deb ¤Î¥Ä¥ê¡¼¤«¤é Packages ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£\n"
-"Packages ¥Õ¥¡¥¤¥ë¤Ï MD5 ¥Ï¥Ã¥·¥å¤ä¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤Ë²Ã¤¨¤Æ¡¢³Æ¥Ñ¥Ã¥±¡¼¥¸\n"
-"¤Î¤¹¤Ù¤Æ¤ÎÀ©¸æ¥Õ¥£¡¼¥ë¥É¤ÎÆâÍƤò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£Priority ¤È Section ¤ÎÃÍ\n"
-"¤ò¶¯À©¤¹¤ë¤¿¤á¤Ë override ¥Õ¥¡¥¤¥ë¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"apt-ftparchive 㯠.deb ã®ãƒ„リーã‹ã‚‰ Packages ファイルを生æˆã—ã¾ã™ã€‚\n"
+"Packages ファイル㯠MD5 ãƒãƒƒã‚·ãƒ¥ã‚„ファイルサイズã«åŠ ãˆã¦ã€å„パッケージ\n"
+"ã®ã™ã¹ã¦ã®åˆ¶å¾¡ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®å†…容をå«ã‚“ã§ã„ã¾ã™ã€‚Priority 㨠Section ã®å€¤\n"
+"を強制ã™ã‚‹ãŸã‚ã« override ファイルãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
"\n"
-"ƱÍÍ¤Ë apt-ftparchive ¤Ï .dsc ¤Î¥Ä¥ê¡¼¤«¤é Sources ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ\n"
-"¤¹¡£--source-override ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¥½¡¼¥¹ override ¥Õ¥¡¥¤¥ë¤ò\n"
-"»ØÄê¤Ç¤­¤Þ¤¹¡£\n"
+"åŒæ§˜ã« apt-ftparchive 㯠.dsc ã®ãƒ„リーã‹ã‚‰ Sources ファイルを生æˆã—ã¾\n"
+"ã™ã€‚--source-override オプションを使用ã™ã‚‹ã¨ã‚½ãƒ¼ã‚¹ override ファイルを\n"
+"指定ã§ãã¾ã™ã€‚\n"
"\n"
-"'packages' ¤ª¤è¤Ó 'sources' ¥³¥Þ¥ó¥É¤Ï¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤Ç¼Â¹Ô¤¹¤ëɬÍפ¬¤¢\n"
-"¤ê¤Þ¤¹¡£BinaryPath ¤Ë¤ÏºÆµ¢¸¡º÷¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¡¢override \n"
-"¥Õ¥¡¥¤¥ë¤Ï override ¥Õ¥é¥°¤ò´Þ¤ó¤Ç¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤â¤· pathprefix \n"
-"¤¬Â¸ºß¤¹¤ì¤Ð¥Õ¥¡¥¤¥ë̾¥Õ¥£¡¼¥ë¥É¤ËÉղ䵤ì¤Þ¤¹¡£debian ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î\n"
-"»ÈÍÑÊýË¡¤ÎÎã:\n"
+"'packages' ãŠã‚ˆã³ 'sources' コマンドã¯ãƒ„リーã®ãƒ«ãƒ¼ãƒˆã§å®Ÿè¡Œã™ã‚‹å¿…è¦ãŒã‚\n"
+"ã‚Šã¾ã™ã€‚BinaryPath ã«ã¯å†å¸°æ¤œç´¢ã®ãƒ™ãƒ¼ã‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã—ã€override \n"
+"ファイル㯠override フラグをå«ã‚“ã§ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã‚‚ã— pathprefix \n"
+"ãŒå­˜åœ¨ã™ã‚Œã°ãƒ•ã‚¡ã‚¤ãƒ«åフィールドã«ä»˜åŠ ã•ã‚Œã¾ã™ã€‚debian アーカイブã§ã®\n"
+"使用方法ã®ä¾‹:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" --md5 MD5 ¤ÎÀ¸À®¤òÀ©¸æ¤¹¤ë\n"
-" -s=? ¥½¡¼¥¹ override ¥Õ¥¡¥¤¥ë\n"
-" -q ɽ¼¨¤òÍÞÀ©¤¹¤ë\n"
-" -d=? ¥ª¥×¥·¥ç¥ó¤Î¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÁªÂò¤¹¤ë\n"
-" --no-delink delinking ¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤òÍ­¸ú¤Ë¤¹¤ë\n"
-" --contents contents ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤òÀ©¸æ¤¹¤ë\n"
-" -c=? »ØÄê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤà\n"
-" -o=? Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" --md5 MD5 ã®ç”Ÿæˆã‚’制御ã™ã‚‹\n"
+" -s=? ソース override ファイル\n"
+" -q 表示を抑制ã™ã‚‹\n"
+" -d=? オプションã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’é¸æŠžã™ã‚‹\n"
+" --no-delink delinking デãƒãƒƒã‚°ãƒ¢ãƒ¼ãƒ‰ã‚’有効ã«ã™ã‚‹\n"
+" --contents contents ファイルã®ç”Ÿæˆã‚’制御ã™ã‚‹\n"
+" -c=? 指定ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読む\n"
+" -o=? ä»»æ„ã®è¨­å®šã‚ªãƒ—ションを設定ã™ã‚‹"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr "ÁªÂò¤Ë¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "é¸æŠžã«ãƒžãƒƒãƒã™ã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾ã›ã‚“"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¥°¥ë¡¼¥× `%s' ¤Ë¸«¤¢¤¿¤é¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹"
+msgstr "パッケージファイルグループ `%s' ã«è¦‹å½“ãŸã‚‰ãªã„ファイルãŒã‚ã‚Šã¾ã™"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB ¤¬²õ¤ì¤Æ¤¤¤¿¤¿¤á¡¢¥Õ¥¡¥¤¥ë̾¤ò %s.old ¤ËÊѹ¹¤·¤Þ¤·¤¿"
+msgstr "DB ãŒå£Šã‚Œã¦ã„ãŸãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ %s.old ã«å¤‰æ›´ã—ã¾ã—ãŸ"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ¤¬¸Å¤¤¤¿¤á¡¢%s ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò»î¤ß¤Þ¤¹"
+msgstr "DB ãŒå¤ã„ãŸã‚ã€%s ã®ã‚¢ãƒƒãƒ—グレードを試ã¿ã¾ã™"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "DB ¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
+msgstr "DB ファイル %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "¥Õ¥¡¥¤¥ë %s ¤ÎÆüÉÕ¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgid "Failed to stat %s"
+msgstr "%s ã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÀ©¸æ¥ì¥³¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "アーカイブã«ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
-msgstr "¥«¡¼¥½¥ë¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
+msgstr "カーソルをå–å¾—ã§ãã¾ã›ã‚“"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "·Ù¹ð: ¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬Æɤá¤Þ¤»¤ó\n"
+msgstr "警告: ディレクトリ %s ãŒèª­ã‚ã¾ã›ã‚“\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "·Ù¹ð: %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "警告: %s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
-msgstr "¥¨¥é¡¼: "
+msgstr "エラー: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
-msgstr "·Ù¹ð: "
+msgstr "警告: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
-msgstr "¥¨¥é¡¼: ¥¨¥é¡¼¤¬Å¬ÍѤµ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ï "
+msgstr "エラー: エラーãŒé©ç”¨ã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
-msgstr "%s ¤Î²ò·è¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®è§£æ±ºã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
-msgstr "¥Ä¥ê¡¼Æâ¤Ç¤Î°ÜÆ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "ツリー内ã§ã®ç§»å‹•ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
-msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " ¥ê¥ó¥¯ %s [%s] ¤ò³°¤·¤Þ¤¹\n"
+msgstr " リンク %s [%s] を外ã—ã¾ã™\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
-msgstr "%s ¤Î readlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®ãƒªãƒ³ã‚¯èª­ã¿å–ã‚Šã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
-msgstr "%s ¤Î unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®ãƒªãƒ³ã‚¯è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** %s ¤ò %s ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "*** %s ã‚’ %s ã«ãƒªãƒ³ã‚¯ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " ¥ê¥ó¥¯¤ò³°¤¹À©¸Â¤Î %sB ¤ËÅþ㤷¤Þ¤·¤¿¡£\n"
-
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr " リンクを外ã™åˆ¶é™ã® %sB ã«åˆ°é”ã—ã¾ã—ãŸã€‚\n"
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
-msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë¥Ñ¥Ã¥±¡¼¥¸¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "アーカイブã«ãƒ‘ッケージフィールドãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s ¤Ë override ¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr " %s ã« override エントリãŒã‚ã‚Šã¾ã›ã‚“\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " %1$s ¥á¥ó¥Æ¥Ê¤Ï %3$s ¤Ç¤Ï¤Ê¤¯ %2$s ¤Ç¤¹\n"
+msgstr " %1$s メンテナ㯠%3$s ã§ã¯ãªã %2$s ã§ã™\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s ã« override エントリãŒã‚ã‚Šã¾ã›ã‚“\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s ã« override エントリãŒã‚ã‚Šã¾ã›ã‚“\n"
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢¥á¥ó¥Ð %s ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "内部エラーã€ãƒ¡ãƒ³ãƒãƒ¼ %s を特定ã§ãã¾ã›ã‚“"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - ¥á¥â¥ê¤Î³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "realloc - メモリã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
msgid "Unable to open %s"
-msgstr "'%s' ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
+msgstr "'%s' をオープンã§ãã¾ã›ã‚“"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "ÉÔÀµ¤Ê override %s %lu ¹ÔÌÜ #1"
+msgstr "ä¸æ­£ãª override %s %lu 行目 #1"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "ÉÔÀµ¤Ê override %s %lu ¹ÔÌÜ #2"
+msgstr "ä¸æ­£ãª override %s %lu 行目 #2"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "ÉÔÀµ¤Ê override %s %lu ¹ÔÌÜ #3"
+msgstr "ä¸æ­£ãª override %s %lu 行目 #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "override ¥Õ¥¡¥¤¥ë %s ¤òÆɤ߹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "override ファイル %s を読ã¿è¾¼ã‚€ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:75
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' ¤Ï̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
+msgstr "'%s' ã¯æœªçŸ¥ã®åœ§ç¸®ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã§ã™"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "°µ½Ì½ÐÎÏ %s ¤Ë¤Ï°µ½Ì¥»¥Ã¥È¤¬É¬ÍפǤ¹"
+msgstr "圧縮出力 %s ã«ã¯åœ§ç¸®ã‚»ãƒƒãƒˆãŒå¿…è¦ã§ã™"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "»Ò¥×¥í¥»¥¹¤Ø¤Î IPC ¥Ñ¥¤¥×¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセスã¸ã® IPC パイプã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr "FILE* ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "FILE* ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr "fork ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "fork ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr "°µ½Ì»Ò¥×¥í¥»¥¹"
+msgstr "圧縮å­ãƒ—ロセス"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "内部エラーã€%s ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "»Ò¥×¥í¥»¥¹ IPC ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセス IPC ã®ç”Ÿæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "°Ê²¼¤Î°µ½Ì¥Ä¡¼¥ë¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: "
+msgstr "以下ã®åœ§ç¸®ãƒ„ールã®å®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸ: "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
-msgstr "Ÿ³«¥Ä¡¼¥ë"
+msgstr "展開ツール"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "»Ò¥×¥í¥»¥¹/¥Õ¥¡¥¤¥ë¤Ø¤Î IO ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセス/ファイルã¸ã® IO ãŒå¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "MD5 ¤Î·×»»Ãæ¤ËÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "MD5 ã®è¨ˆç®—中ã«èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr "%s ¤Î unlink ¤ÇÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
+msgstr "%s ã®ãƒªãƒ³ã‚¯è§£é™¤ã§å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "%s ¤ò %s ¤Ë¥ê¥Í¡¼¥à¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s ã‚’ %s ã«åå‰å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s"
+msgstr "æ­£è¦è¡¨ç¾ã®å±•é–‹ã‚¨ãƒ©ãƒ¼ - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤ÏËþ¤¿¤»¤Ê¤¤°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージã«ã¯æº€ãŸã›ãªã„ä¾å­˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
-msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
-msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã™"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
-msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
-msgstr "¤·¤«¤·¡¢¤³¤ì¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹"
+msgstr "ã—ã‹ã—ã€ã“ã‚Œã¯ä»®æƒ³ãƒ‘ッケージã§ã™"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
-msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤»¤ó"
+msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã›ã‚“"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
-msgstr " ¤Þ¤¿¤Ï"
+msgstr " ã¾ãŸã¯"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¿·¤¿¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージãŒæ–°ãŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Öºï½ü¡×¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージã¯ã€Œå‰Šé™¤ã€ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊÝᤵ¤ì¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージã¯ä¿ç•™ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージã¯ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ãƒ‘ッケージã¯ã€Œãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã€ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
-msgstr "°Ê²¼¤ÎÊѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®å¤‰æ›´ç¦æ­¢ãƒ‘ッケージã¯å¤‰æ›´ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
-msgstr "%s (%s ¤Î¤¿¤á) "
+msgstr "%s (%s ã®ãŸã‚) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"·Ù¹ð: °Ê²¼¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤Þ¤¹\n"
-"²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤«¤¬¤Á¤ã¤ó¤È¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!"
+"警告: 以下ã®ä¸å¯æ¬ ãƒ‘ッケージãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚\n"
+"何をã—よã†ã¨ã—ã¦ã„ã‚‹ã‹æœ¬å½“ã«ã‚ã‹ã£ã¦ã„ãªã„å ´åˆã¯ã€å®Ÿè¡Œã—ã¦ã¯ã„ã‘ã¾ã›ã‚“!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É: %lu ¸Ä¡¢¿·µ¬¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢"
+msgstr "アップグレード: %lu 個ã€æ–°è¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
-msgstr "ºÆ¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢"
+msgstr "å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
-msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É: %lu ¸Ä¡¢"
+msgstr "ダウングレード: %lu 個ã€"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ºï½ü: %lu ¸Ä¡¢ÊÝα: %lu ¸Ä¡£\n"
+msgstr "削除: %lu 個ã€ä¿ç•™: %lu 個。\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr "%lu 個ã®ãƒ‘ッケージãŒå®Œå…¨ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
-msgstr "°Í¸´Ø·¸¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹..."
+msgstr "ä¾å­˜é–¢ä¿‚を解決ã—ã¦ã„ã¾ã™ ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
-msgstr " ¼ºÇÔ¤·¤Þ¤·¤¿¡£"
+msgstr " 失敗ã—ã¾ã—ãŸã€‚"
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
-msgstr "°Í¸´Ø·¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "ä¾å­˜é–¢ä¿‚を訂正ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
-msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥»¥Ã¥È¤òºÇ¾®²½¤Ç¤­¤Þ¤»¤ó"
+msgstr "アップグレードセットを最å°åŒ–ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
-msgstr " ´°Î»"
+msgstr " 完了"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-"¤³¤ì¤é¤òľ¤¹¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»"
-"¤ó¡£"
+"ã“れらを直ã™ãŸã‚ã«ã¯ 'apt-get -f install' を実行ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›"
+"ん。"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
-msgstr "̤²ò·è¤Î°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹¡£-f ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr "未解決ã®ä¾å­˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™ã€‚-f オプションを試ã—ã¦ãã ã•ã„。"
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "·Ù¹ð: °Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïǧ¾Ú¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
+msgstr "警告: 以下ã®ãƒ‘ッケージã¯èªè¨¼ã•ã‚Œã¦ã„ã¾ã›ã‚“!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "èªè¨¼ã®è­¦å‘Šã¯ä¸Šæ›¸ãã•ã‚Œã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr "¸¡¾Ú¤Ê¤·¤Ë¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤« [y/N]? "
+msgstr "検証ãªã—ã«ã“れらã®ãƒ‘ッケージをインストールã—ã¾ã™ã‹ [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
-msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ç§¾Ú¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ã„ãã¤ã‹ã®ãƒ‘ッケージをèªè¨¼ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
-msgstr "ÌäÂ꤬ȯÀ¸¤·¡¢-y ¥ª¥×¥·¥ç¥ó¤¬ --force-yes ¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
+msgstr "å•é¡ŒãŒç™ºç”Ÿã—ã€-y オプション㌠--force-yes ãªã—ã§ä½¿ç”¨ã•ã‚Œã¾ã—ãŸ"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部エラーã€InstallPackages ãŒå£Šã‚ŒãŸãƒ‘ッケージã§å‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸ!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ºï½ü¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "パッケージを削除ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ãŒã€å‰Šé™¤ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚"
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ"
+msgstr "内部エラーã€èª¿æ•´ãŒçµ‚ã‚ã£ã¦ã„ã¾ã›ã‚“"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
-msgstr "¥À¥¦¥ó¥í¡¼¥É¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
+msgstr "ダウンロードディレクトリをロックã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
-msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "ソースã®ãƒªã‚¹ãƒˆã‚’読むã“ã¨ãŒã§ãã¾ã›ã‚“。"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"ãŠã£ã¨ã€ã‚µã‚¤ã‚ºãŒãƒžãƒƒãƒã—ã¾ã›ã‚“。apt@packages.debian.org ã«ãƒ¡ãƒ¼ãƒ«ã—ã¦ãã ã•ã„"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "%2$sB Ãæ %1$sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "%2$sB 中 %1$sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "%sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "%sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Ÿ³«¸å¤ËÄÉ²Ã¤Ç %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¾ÃÈñ¤µ¤ì¤Þ¤¹¡£\n"
+msgstr "展開後ã«è¿½åŠ ã§ %sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒæ¶ˆè²»ã•ã‚Œã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Ÿ³«¸å¤Ë %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬²òÊü¤µ¤ì¤Þ¤¹¡£\n"
+msgstr "展開後㫠%sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒè§£æ”¾ã•ã‚Œã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "%s ã®ç©ºã領域を測定ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£"
+msgstr "%s ã«å……分ãªç©ºãスペースãŒã‚ã‚Šã¾ã›ã‚“。"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¤³¤ì¤Ï´Êñ¤ÊÁàºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "Trivial Only ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€ã“ã‚Œã¯ç°¡å˜ãªæ“作ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"½ÅÂç¤ÊÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤Î¤¢¤ë¤³¤È¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n"
-"³¹Ô¤¹¤ë¤Ë¤Ï¡¢'%s' ¤È¤¤¤¦¥Õ¥ì¡¼¥º¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"é‡å¤§ãªå•é¡Œã‚’引ãèµ·ã“ã™å¯èƒ½æ€§ã®ã‚ã‚‹ã“ã¨ã‚’ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚\n"
+"続行ã™ã‚‹ã«ã¯ã€'%s' ã¨ã„ã†ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’タイプã—ã¦ãã ã•ã„。\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
-msgstr "ÃæÃǤ·¤Þ¤·¤¿¡£"
+msgstr "中断ã—ã¾ã—ãŸã€‚"
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
-msgstr "³¹Ô¤·¤Þ¤¹¤« [Y/n]? "
+msgstr "続行ã—ã¾ã™ã‹ [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "%s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ %s\n"
+msgstr "%s ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—㟠%s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
-msgstr "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
-msgstr "¥À¥¦¥ó¥í¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿"
+msgstr "ダウンロードオンリーモードã§ãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ãŒå®Œäº†ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£apt-get update ¤ò¼Â¹Ô¤¹¤ë¤« --fix-"
-"missing ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
+"ã„ãã¤ã‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ãŒå–å¾—ã§ãã¾ã›ã‚“。apt-get update を実行ã™ã‚‹ã‹ --fix-"
+"missing オプションを付ã‘ã¦è©¦ã—ã¦ã¿ã¦ãã ã•ã„。"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing ¤È¥á¥Ç¥£¥¢¸ò´¹¤Ï¸½ºßƱ»þ¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "--fix-missing ã¨ãƒ¡ãƒ‡ã‚£ã‚¢äº¤æ›ã¯ç¾åœ¨åŒæ™‚ã«ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
-msgstr "­¤ê¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "足りãªã„パッケージを直ã™ã“ã¨ãŒã§ãã¾ã›ã‚“。"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤òÃæÃǤ·¤Þ¤¹¡£"
+msgstr "インストールを中断ã—ã¾ã™ã€‚"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Ãí°Õ¡¢%2$s ¤ÎÂå¤ï¤ê¤Ë %1$s ¤òÁªÂò¤·¤Þ¤¹\n"
+msgstr "注æ„ã€%2$s ã®ä»£ã‚ã‚Šã« %1$s ã‚’é¸æŠžã—ã¾ã™\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢%s ¤ò¥¹¥­¥Ã¥×"
-"¤·¤Þ¤¹¡£\n"
+"ã™ã§ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ãŠã‚Šã‚¢ãƒƒãƒ—グレードも設定ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€%s をスキッ"
+"プã—ã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢ºï½ü¤Ï¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "パッケージ %s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€å‰Šé™¤ã¯ã§ãã¾ã›ã‚“\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s ¤Ï°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë²¾Áۥѥ屡¼¥¸¤Ç¤¹:\n"
+msgstr "%s ã¯ä»¥ä¸‹ã®ãƒ‘ッケージã§æä¾›ã•ã‚Œã¦ã„る仮想パッケージã§ã™:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
-msgstr " [¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß]"
+msgstr " [インストール済ã¿]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨Åª¤ËÁªÂò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+msgstr "インストールã™ã‚‹ãƒ‘ッケージを明示的ã«é¸æŠžã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï¸ºß¤·¤Þ¤¹¤¬¡¢ÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
-"¤ª¤½¤é¤¯¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¤â¤¦¸Å¤¯¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n"
-"¤¢¤ë¤¤¤ÏÊ̤Υ½¡¼¥¹¤«¤é¤Î¤ß¤·¤«ÍøÍѤǤ­¤Ê¤¤¤È¤¤¤¦¾õ¶·¤¬¹Í¤¨¤é¤ì¤Þ¤¹\n"
+"パッケージ %s ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«ã¯å­˜åœ¨ã—ã¾ã™ãŒã€åˆ©ç”¨ã§ãã¾ã›ã‚“。\n"
+"ãŠãらãã€ãã®ãƒ‘ッケージãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ã‚‚ã†å¤ããªã£ã¦ã„ã‚‹ã‹ã€\n"
+"ã‚ã‚‹ã„ã¯åˆ¥ã®ã‚½ãƒ¼ã‚¹ã‹ã‚‰ã®ã¿ã—ã‹åˆ©ç”¨ã§ããªã„ã¨ã„ã†çŠ¶æ³ãŒè€ƒãˆã‚‰ã‚Œã¾ã™\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
-msgstr "¤·¤«¤·¡¢°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹:"
+msgstr "ã—ã‹ã—ã€ä»¥ä¸‹ã®ãƒ‘ッケージã§ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¸õÊ䤬¤¢¤ê¤Þ¤»¤ó"
+msgstr "パッケージ %s ã«ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å€™è£œãŒã‚ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "¥À¥¦¥ó¥í¡¼¥É¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢%s ¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ë¤ÏÉÔ²Äǽ¤Ç¤¹¡£\n"
+msgstr "ダウンロードã§ããªã„ãŸã‚ã€%s ã®å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯ä¸å¯èƒ½ã§ã™ã€‚\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s ¤Ï´û¤ËºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£\n"
+msgstr "%s ã¯ã™ã§ã«æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™ã€‚\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' ¤Î¥ê¥ê¡¼¥¹ '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "'%2$s' ã®ãƒªãƒªãƒ¼ã‚¹ '%1$s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' ¤Î¥Ð¡¼¥¸¥ç¥ó '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "'%2$s' ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ '%1$s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "%3$s ¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó %1$s (%2$s) ¤òÁªÂò¤·¤Þ¤·¤¿\n"
+msgstr "%3$s ã«ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1$s (%2$s) ã‚’é¸æŠžã—ã¾ã—ãŸ\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
-msgstr "update ¥³¥Þ¥ó¥É¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó"
+msgstr "update コマンドã¯å¼•æ•°ã‚’ã¨ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
-msgstr "list ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "list ディレクトリをロックã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢¤¢"
-"¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£"
+"ã„ãã¤ã‹ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“れらã¯ç„¡è¦–ã•ã‚Œ"
+"ã‚‹ã‹ã€å¤ã„ã‚‚ã®ãŒä»£ã‚ã‚Šã«ä½¿ã‚ã‚Œã¾ã™ã€‚"
+
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "以下ã®æƒ…å ±ãŒã“ã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã«å½¹ç«‹ã¤ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部エラーã€å•é¡Œãƒªã‚¾ãƒ«ãƒãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿"
+msgstr "内部エラーã€AllUpgrade ãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó"
+msgstr "パッケージ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Ãí°Õ: Àµµ¬É½¸½ '%2$s' ¤ËÂФ·¤Æ %1$s ¤òÁªÂò¤·¤Þ¤·¤¿\n"
+msgstr "注æ„: æ­£è¦è¡¨ç¾ '%2$s' ã«å¯¾ã—㦠%1$s ã‚’é¸æŠžã—ã¾ã—ãŸ\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-"°Ê²¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì"
-"¤Þ¤»¤ó:"
+"以下ã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã« 'apt-get -f install' を実行ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œ"
+"ã¾ã›ã‚“:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡"
-"¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£"
+"未解決ã®ä¾å­˜é–¢ä¿‚ã§ã™ã€‚'apt-get -f install' を実行ã—ã¦ã¿ã¦ãã ã•ã„ (ã¾ãŸã¯è§£æ³•"
+"を明示ã—ã¦ãã ã•ã„)。"
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤·¤¿¡£¤ª¤½¤é¤¯¡¢¤¢¤ê¤¨\n"
-"¤Ê¤¤¾õ¶·¤òÍ׵ᤷ¤¿¤«¡¢É¬Íפʥѥ屡¼¥¸¤¬¤Þ¤ÀºîÀ®¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê \n"
-"Incoming ¤«¤é°ÜÆ°¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ°ÂÄêÈǥǥ£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ·\n"
-"¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£"
+"インストールã™ã‚‹ã“ã¨ãŒã§ããªã„パッケージãŒã‚ã‚Šã¾ã—ãŸã€‚ãŠãらãã€ã‚ã‚Šå¾—\n"
+"ãªã„状æ³ã‚’è¦æ±‚ã—ãŸã‹ã€(ä¸å®‰å®šç‰ˆãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションを使用ã—ã¦ã„ã‚‹ã®\n"
+"ã§ã‚ã‚Œã°) å¿…è¦ãªãƒ‘ッケージãŒã¾ã ä½œæˆã•ã‚Œã¦ã„ãªã‹ã£ãŸã‚Š Incoming ã‹ã‚‰ç§»\n"
+"å‹•ã•ã‚Œã¦ã„ãªã„ã“ã¨ãŒè€ƒãˆã‚‰ã‚Œã¾ã™ã€‚"
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"ñ½ã¤ÊÁàºî¤ò¹Ô¤Ã¤¿¤À¤±¤Ê¤Î¤Ç¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤\n"
-"²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À\n"
-"¤µ¤¤¡£"
+"å˜ç´”ãªæ“作を行ã£ãŸã ã‘ãªã®ã§ã€ã“ã®ãƒ‘ッケージã¯å˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ããªã„\n"
+"å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ã€‚ãã®ãŸã‚ã€ã“ã®ãƒ‘ッケージã¸ã®ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã£ã¦ãã \n"
+"ã•ã„。"
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
-msgstr "²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸"
+msgstr "壊れãŸãƒ‘ッケージ"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ç‰¹åˆ¥ãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
-msgstr "Äó°Æ¥Ñ¥Ã¥±¡¼¥¸:"
+msgstr "æ案パッケージ:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
-msgstr "¿ä¾©¥Ñ¥Ã¥±¡¼¥¸:"
+msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤·¤Æ¤¤¤Þ¤¹... "
+msgstr "アップグレードパッケージを検出ã—ã¦ã„ã¾ã™ ... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr "¼ºÇÔ"
+msgstr "失敗"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
-msgstr "´°Î»"
+msgstr "完了"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿"
+msgstr "内部エラーã€å•é¡Œãƒªã‚¾ãƒ«ãƒãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
-"¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
+"ソースをå–å¾—ã™ã‚‹ã«ã¯å°‘ãªãã¨ã‚‚ã²ã¨ã¤ã®ãƒ‘ッケージåを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "%s ¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "%s ã®ã‚½ãƒ¼ã‚¹ãƒ‘ッケージãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ã™ã§ã«ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« '%s' をスキップã—ã¾ã™\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "%s ã«å……分ãªç©ºãスペースãŒã‚ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%2$sB Ãæ %1$sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "%2$sB 中 %1$sB ã®ã‚½ãƒ¼ã‚¹ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "%sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "%sB ã®ã‚½ãƒ¼ã‚¹ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
-msgstr "¥½¡¼¥¹ %s ¤ò¼èÆÀ\n"
+msgstr "ソース %s ã‚’å–å¾—\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
-msgstr "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
+msgstr "ã„ãã¤ã‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "¤¹¤Ç¤Ë %s ¤ËŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤¬¤¢¤ë¤¿¤á¡¢Å¸³«¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
+msgstr "ã™ã§ã« %s ã«å±•é–‹ã•ã‚ŒãŸã‚½ãƒ¼ã‚¹ãŒã‚ã‚‹ãŸã‚ã€å±•é–‹ã‚’スキップã—ã¾ã™\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
+msgstr "展開コマンド '%s' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
+"'dpkg-dev' パッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "¥Ó¥ë¥É¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
+msgstr "ビルドコマンド '%s' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
-msgstr "»Ò¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセスãŒå¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
+"ビルドä¾å­˜é–¢ä¿‚ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ãƒ‘ッケージを少ãªãã¨ã‚‚ 1 ã¤æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "%s ¤Î build-dependency ¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s ã®ãƒ“ルドä¾å­˜æƒ…報をå–å¾—ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s ¤Ë¤Ï build depends ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr "%s ã«ã¯ãƒ“ルドä¾å­˜æƒ…å ±ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È"
-"¤¬¤Ç¤­¤Þ¤»¤ó"
+"パッケージ %3$s ãŒè¦‹ã¤ã‹ã‚‰ãªã„ãŸã‚ã€%2$s ã«å¯¾ã™ã‚‹ %1$s ã®ä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨"
+"ãŒã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂÐ"
-"¤¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+"入手å¯èƒ½ãª %3$s ã¯ã„ãšã‚Œã‚‚ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¤ã„ã¦ã®è¦æ±‚を満ãŸã›ãªã„ãŸã‚ã€%2$s ã«å¯¾"
+"ã™ã‚‹ %1$s ã®ä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ %3$s ¥Ñ¥Ã"
-"¥±¡¼¥¸¤Ï¿·¤·¤¹¤®¤Þ¤¹"
+"%2$s ã®ä¾å­˜é–¢ä¿‚ %1$s を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“: インストールã•ã‚ŒãŸ %3$s パッ"
+"ケージã¯æ–°ã—ã™ãŽã¾ã™"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %3$s"
+msgstr "%2$s ã®ä¾å­˜é–¢ä¿‚ %1$s を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“: %3$s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s ¤Î Build-dependency ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr "%s ã®ãƒ“ルドä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
-msgstr "build dependency ¤Î½èÍý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "ビルドä¾å­˜é–¢ä¿‚ã®å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
-msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë:"
+msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るモジュール:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1225,73 +1267,73 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"»ÈÍÑË¡: apt-get [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É\n"
-" apt-get [¥ª¥×¥·¥ç¥ó] install|remove ¥Ñ¥Ã¥±¡¼¥¸Ì¾1 [¥Ñ¥Ã¥±¡¼¥¸Ì¾"
+"使用法: apt-get [オプション] コマンド\n"
+" apt-get [オプション] install|remove パッケージå1 [パッケージå"
"2 ...]\n"
-" apt-get [¥ª¥×¥·¥ç¥ó] source ¥Ñ¥Ã¥±¡¼¥¸Ì¾1 [¥Ñ¥Ã¥±¡¼¥¸Ì¾2 ...]\n"
+" apt-get [オプション] source パッケージå1 [パッケージå2 ...]\n"
"\n"
-"apt-get ¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É/¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î´Êñ¤Ê¥³¥Þ\n"
-"¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£¤â¤Ã¤È¤â¤è¤¯»È¤ï¤ì¤ë¥³¥Þ¥ó¥É¤Ï¡¢update \n"
-"¤È install ¤Ç¤¹¡£\n"
+"apt-get ã¯ã€ãƒ‘ッケージをダウンロード/インストールã™ã‚‹ãŸã‚ã®ç°¡å˜ãªã‚³ãƒž\n"
+"ンドラインインタフェースã§ã™ã€‚ã‚‚ã£ã¨ã‚‚よã使ã‚れるコマンドã¯ã€update \n"
+"㨠install ã§ã™ã€‚\n"
"\n"
-"¥³¥Þ¥ó¥É:\n"
-" update - ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀ¡¦¹¹¿·¤·¤Þ¤¹\n"
-" upgrade - ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¤¤Þ¤¹\n"
-" install - ¿·µ¬¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹\n"
-" (pkg ¤Ï libc6.deb ¤Ç¤Ï¤Ê¤¯ libc6 ¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹)\n"
-" remove - ¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Þ¤¹\n"
-" source - ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹\n"
-" build-dep - ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Î¹½Ã۰͸´Ø·¸¤òÀßÄꤷ¤Þ¤¹\n"
-" dist-upgrade - ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n"
-" (apt-get(8) ¤ò»²¾È)\n"
-" dselect-upgrade - dselect ¤ÎÁªÂò¤Ë¤·¤¿¤¬¤¤¤Þ¤¹\n"
-" clean - ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹\n"
-" autoclean - ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¸Å¤¤¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹\n"
-" check - ²õ¤ì¤¿°Í¸´Ø·¸¤¬¤Ê¤¤¤«¥Á¥§¥Ã¥¯¤·¤Þ¤¹\n"
+"コマンド:\n"
+" update - パッケージリストをå–得・更新ã—ã¾ã™\n"
+" upgrade - アップグレードを行ã„ã¾ã™\n"
+" install - æ–°è¦ãƒ‘ッケージをインストールã—ã¾ã™\n"
+" (pkg 㯠libc6.deb ã§ã¯ãªã libc6 ã®ã‚ˆã†ã«æŒ‡å®šã—ã¾ã™)\n"
+" remove - パッケージを削除ã—ã¾ã™\n"
+" source - ソースアーカイブをダウンロードã—ã¾ã™\n"
+" build-dep - ソースパッケージã®æ§‹ç¯‰ä¾å­˜é–¢ä¿‚を設定ã—ã¾ã™\n"
+" dist-upgrade - ディストリビューションをアップグレードã—ã¾ã™\n"
+" (apt-get(8) ã‚’å‚ç…§)\n"
+" dselect-upgrade - dselect ã®é¸æŠžã«å¾“ã„ã¾ã™\n"
+" clean - ダウンロードã—ãŸã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ファイルを削除ã—ã¾ã™\n"
+" autoclean - ダウンロードã—ãŸå¤ã„アーカイブファイルを削除ã—ã¾ã™\n"
+" check - 壊れãŸä¾å­˜é–¢ä¿‚ãŒãªã„ã‹ãƒã‚§ãƒƒã‚¯ã—ã¾ã™\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" -q ¥í¥°¥Õ¥¡¥¤¥ë¤Ë½ÐÎϲÄǽ¤Ê·Á¼°¤Ë¤¹¤ë - ¥×¥í¥°¥ì¥¹É½¼¨¤ò¤·¤Ê¤¤\n"
-" -qq ¥¨¥é¡¼°Ê³°¤Ïɽ¼¨¤·¤Ê¤¤\n"
-" -d ¥À¥¦¥ó¥í¡¼¥É¤Î¤ß¹Ô¤¦ - ¥¢¡¼¥«¥¤¥Ö¤Î¥¤¥ó¥¹¥È¡¼¥ë¤äŸ³«¤Ï¹Ô¤ï¤Ê¤¤\n"
-" -s ¼ÂºÝ¤Ë¤Ï¼Â¹Ô¤·¤Ê¤¤¡£¼Â¹Ô¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤Î¤ß¹Ô¤¦\n"
-" -y Á´¤Æ¤ÎÌ䤤¹ç¤ï¤»¤Ë Yes ¤ÇÅú¤¨¡¢¥×¥í¥ó¥×¥È¤ÏÊÖ¤µ¤Ê¤¤\n"
-" -f À°¹çÀ­¥Á¥§¥Ã¥¯¤Ç¼ºÇÔ¤·¤Æ¤â½èÍý¤ò³¹Ô¤¹¤ë\n"
-" -m ¥¢¡¼¥«¥¤¥Ö¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤â³¹Ô¤¹¤ë\n"
-" -u ¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤âɽ¼¨¤¹¤ë\n"
-" -b ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤·¡¢¥Ó¥ë¥É¤ò¹Ô¤¦\n"
-" -V ¾éĹ¤Ê¥Ð¡¼¥¸¥ç¥ó¥Ê¥ó¥Ð¤òɽ¼¨¤¹¤ë\n"
-" -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à\n"
-" -o=? Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë, Îã -o dir::cache=/tmp\n"
-"¥ª¥×¥·¥ç¥ó¡¦ÀßÄê¤Ë´Ø¤·¤Æ¤Ï¡¢¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸ apt-get(8)¡¢sources.list(5)¡¢\n"
-"apt.conf(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-" ¤³¤Î APT ¤Ï Super Cow Powers ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" -q ログファイルã«å‡ºåŠ›å¯èƒ½ãªå½¢å¼ã«ã™ã‚‹ - プログレス表示をã—ãªã„\n"
+" -qq エラー以外ã¯è¡¨ç¤ºã—ãªã„\n"
+" -d ダウンロードã®ã¿è¡Œã† - アーカイブã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚„展開ã¯è¡Œã‚ãªã„\n"
+" -s 実際ã«ã¯å®Ÿè¡Œã—ãªã„。実行シミュレーションã®ã¿è¡Œã†\n"
+" -y ã™ã¹ã¦ã®å•ã„åˆã‚ã›ã« Yes ã§ç­”ãˆã€ãƒ—ロンプトã¯è¿”ã•ãªã„\n"
+" -f æ•´åˆæ€§ãƒã‚§ãƒƒã‚¯ã§å¤±æ•—ã—ã¦ã‚‚処ç†ã‚’続行ã™ã‚‹\n"
+" -m アーカイブãŒå­˜åœ¨ã—ãªã„å ´åˆã‚‚続行ã™ã‚‹\n"
+" -u アップグレードã•ã‚Œã‚‹ãƒ‘ッケージも表示ã™ã‚‹\n"
+" -b ソースパッケージをå–å¾—ã—ã€ãƒ“ルドを行ã†\n"
+" -V 冗長ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒŠãƒ³ãƒã‚’表示ã™ã‚‹\n"
+" -c=? 指定ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€\n"
+" -o=? ä»»æ„ã®è¨­å®šã‚ªãƒ—ションを指定ã™ã‚‹, 例 -o dir::cache=/tmp\n"
+"オプション・設定ã«é–¢ã—ã¦ã¯ã€ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ apt-get(8)ã€sources.list(5)ã€\n"
+"apt.conf(5) ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+" ã“ã® APT 㯠Super Cow Powers 化ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "¥Ò¥Ã¥È "
+msgstr "ヒット "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "¼èÆÀ:"
+msgstr "å–å¾—:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "̵»ë "
+msgstr "無視 "
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr "¥¨¥é¡¼ "
+msgstr "エラー "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB ¤ò %s ¤Ç¼èÆÀ¤·¤Þ¤·¤¿ (%sB/s)\n"
+msgstr "%sB ã‚’ %s ã§å–å¾—ã—ã¾ã—㟠(%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " [½èÍýÃæ]"
+msgstr " [処ç†ä¸­]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1300,13 +1342,13 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"¥á¥Ç¥£¥¢Êѹ¹: \n"
+"メディア変更: \n"
" '%s'\n"
-"¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n"
+"ã¨ãƒ©ãƒ™ãƒ«ã®ä»˜ã„ãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ドライブ '%s' ã«å…¥ã‚Œã¦ enter を押ã—ã¦ãã ã•ã„\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "ÉÔÌÀ¤Ê¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤Ç¤¹!"
+msgstr "ä¸æ˜Žãªãƒ‘ッケージレコードã§ã™!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1321,227 +1363,228 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"»ÈÍÑÊýË¡: apt-sortpkgs [¥ª¥×¥·¥ç¥ó] ¥Õ¥¡¥¤¥ë̾1 [¥Õ¥¡¥¤¥ë̾2 ...]\n"
+"使用方法: apt-sortpkgs [オプション] ファイルå1 [ファイルå2 ...]\n"
"\n"
-"apt-sortpkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¥½¡¼¥È¤¹¤ë¤¿¤á¤Î´Êñ¤Ê¥Ä¡¼¥ë¤Ç¤¹¡£\n"
-"-s ¥ª¥×¥·¥ç¥ó¤Ï¥Õ¥¡¥¤¥ë¤Î¼ïÎà¤ò¼¨¤¹¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£\n"
+"apt-sortpkgs ã¯ãƒ‘ッケージファイルをソートã™ã‚‹ãŸã‚ã®ç°¡å˜ãªãƒ„ールã§ã™ã€‚\n"
+"-s オプションã¯ãƒ•ã‚¡ã‚¤ãƒ«ã®ç¨®é¡žã‚’示ã™ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-" -h ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë\n"
-" -s ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¥½¡¼¥È¤ò»ÈÍѤ¹¤ë\n"
-" -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n"
-" -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n"
+" -s ソースファイルソートを使用ã™ã‚‹\n"
+" -c=? 指定ã—ãŸè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã‚€\n"
+" -o=? 指定ã—ãŸè¨­å®šã‚ªãƒ—ションをé©ç”¨ã™ã‚‹ (例: -o dir::cache=/tmp)\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄ꤬¤è¤¯¤¢¤ê¤Þ¤»¤ó!"
+msgstr "ä¸æ­£ãªãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨­å®šã§ã™!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
msgid "Press enter to continue."
-msgstr "enter ¤ò²¡¤¹¤È³¹Ô¤·¤Þ¤¹¡£"
+msgstr "enter を押ã™ã¨ç¶šè¡Œã—ã¾ã™ã€‚"
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Ÿ³«Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò"
+msgstr "展開中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚インストールã•ã‚ŒãŸãƒ‘ッケージを"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "ÀßÄꤷ¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥¨¥é¡¼¤¬Ê£¿ô½Ð¤ë¤«¡¢°Í¸´Ø·¸¤Î·çÇ¡¤Ë"
+msgstr "設定ã—ã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ã‚¨ãƒ©ãƒ¼ãŒè¤‡æ•°å‡ºã‚‹ã‹ã€ä¾å­˜é–¢ä¿‚ã®æ¬ å¦‚ã«"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "¤è¤ë¥¨¥é¡¼¤¬½Ð¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤ÏÌäÂê¤Ï¤Ê¤¯¡¢¾åµ­¤Î¥á¥Ã¥»¡¼¥¸"
+msgstr "よるエラーãŒå‡ºã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ã“ã‚Œã«ã¯å•é¡Œã¯ãªãã€ä¸Šè¨˜ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr "¤¬½ÅÍפǤ¹¡£¤³¤ì¤ò½¤Àµ¤·¤Æ [I]nstall ¤òºÆÅټ¹Ԥ·¤Æ¤¯¤À¤µ¤¤"
+msgstr "ãŒé‡è¦ã§ã™ã€‚ã“れを修正ã—ã¦ã€Œå°Žå…¥ã€ã‚’å†åº¦å®Ÿè¡Œã—ã¦ãã ã•ã„"
#: dselect/update:30
msgid "Merging available information"
-msgstr "Æþ¼ê²Äǽ¾ðÊó¤ò¥Þ¡¼¥¸¤·¤Æ¤¤¤Þ¤¹"
+msgstr "入手å¯èƒ½æƒ…報をマージã—ã¦ã„ã¾ã™"
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr "¥Ñ¥¤¥×¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "パイプã®ç”Ÿæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
-msgstr "gzip ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "gzip ã®å®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
-msgstr "²õ¤ì¤¿¥¢¡¼¥«¥¤¥Ö"
+msgstr "壊れãŸã‚¢ãƒ¼ã‚«ã‚¤ãƒ–"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
-msgstr "tar ¥Á¥§¥Ã¥¯¥µ¥à¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£¥¢¡¼¥«¥¤¥Ö¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "tar ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚アーカイブãŒå£Šã‚Œã¦ã„ã¾ã™"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "̤ÃΤΠTAR ¥Ø¥Ã¥À¥¿¥¤¥× %u¡¢¥á¥ó¥Ð %s"
+msgstr "未知㮠TAR ヘッダタイプ %uã€ãƒ¡ãƒ³ãƒãƒ¼ %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr "ÉÔÀµ¤Ê¥¢¡¼¥«¥¤¥Ö½ð̾"
+msgstr "ä¸æ­£ãªã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ç½²å"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr "¥¢¡¼¥«¥¤¥Ö¥á¥ó¥Ð¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "アーカイブメンãƒãƒ¼ãƒ˜ãƒƒãƒ€ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "ÉÔÀµ¤Ê¥¢¡¼¥«¥¤¥Ö¥á¥ó¥Ð¥Ø¥Ã¥À"
+msgstr "ä¸æ­£ãªã‚¢ãƒ¼ã‚«ã‚¤ãƒ–メンãƒãƒ¼ãƒ˜ãƒƒãƒ€"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
-msgstr "¥¢¡¼¥«¥¤¥Ö¤¬ÉÔ­¤·¤Æ¤¤¤Þ¤¹"
+msgstr "アーカイブãŒä¸è¶³ã—ã¦ã„ã¾ã™"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "¥¢¡¼¥«¥¤¥Ö¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "アーカイブヘッダã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr "¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤Ç DropNode ¤¬¸Æ¤Ð¤ì¤Þ¤·¤¿"
+msgstr "リンクã•ã‚Œã¦ã„るノード㧠DropNode ãŒå‘¼ã°ã‚Œã¾ã—ãŸ"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr "¥Ï¥Ã¥·¥åÍ×ÁǤòÆÃÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó!"
+msgstr "ãƒãƒƒã‚·ãƒ¥è¦ç´ ã‚’特定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“!"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr "diversion ¤Î³ä¤êÅö¤Æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "diversion ã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
-msgstr "AddDiversion ¤Ç¤ÎÆâÉô¥¨¥é¡¼"
+msgstr "AddDiversion ã§ã®å†…部エラー"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s ¤È %s/%s ¤Î diversion ¤ò¾å½ñ¤­¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s -> %s 㨠%s/%s ã® diversion を上書ãã—よã†ã¨ã—ã¦ã„ã¾ã™"
#: apt-inst/filelist.cc:510
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s ¤Î diversion ¤¬Æó½Å¤ËÄɲ䵤ì¤Æ¤¤¤Þ¤¹"
+msgstr "%s -> %s ã® diversion ãŒäºŒé‡ã«è¿½åŠ ã•ã‚Œã¦ã„ã¾ã™"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s/%s ¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
+msgstr "設定ファイル %s/%s ãŒé‡è¤‡ã—ã¦ã„ã¾ã™"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "%s ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "ファイル %s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr "%s ¤Î¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®ã‚¯ãƒ­ãƒ¼ã‚ºã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
-msgstr "¥Ñ¥¹ %s ¤ÏŤ¹¤®¤Þ¤¹"
+msgstr "パス %s ã¯é•·ã™ãŽã¾ã™"
#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr "%s ¤òÊ£¿ô²óŸ³«¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s を複数回展開ã—ã¦ã„ã¾ã™"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ï divert ¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "ディレクトリ %s 㯠divert ã•ã‚Œã¦ã„ã¾ã™"
#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï diversion ¤Î¥¿¡¼¥²¥Ã¥È¤Î %s/%s ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+"ã“ã®ãƒ‘ッケージ㯠diversion ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã® %s/%s ã«æ›¸ã込もã†ã¨ã—ã¦ã„ã¾ã™"
#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
-msgstr "diversion ¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹"
+msgstr "diversion パスãŒé•·ã™ãŽã¾ã™"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬Èó¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ´¹¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+msgstr "ディレクトリ %s ãŒéžãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ç½®æ›ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã™"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr "¥Ï¥Ã¥·¥å¥Ð¥±¥ÄÆâ¤Ç¥Î¡¼¥É¤òÆÃÄꤹ¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "ãƒãƒƒã‚·ãƒ¥ãƒã‚±ãƒ„内ã§ãƒŽãƒ¼ãƒ‰ã‚’特定ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/extract.cc:287
msgid "The path is too long"
-msgstr "¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹"
+msgstr "パスãŒé•·ã™ãŽã¾ã™"
#: apt-inst/extract.cc:417
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "%s ¤ËÂФ¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¥Þ¥Ã¥Á¤ò¾å½ñ¤­¤·¤Þ¤¹"
+msgstr "%s ã«å¯¾ã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãªã„パッケージマッãƒã‚’上書ãã—ã¾ã™"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "¥Õ¥¡¥¤¥ë %s/%s ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹"
+msgstr "ファイル %s/%s ãŒãƒ‘ッケージ %s ã®ã‚‚ã®ã‚’上書ãã—ã¾ã™"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
-msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s を読ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: apt-inst/extract.cc:494
#, c-format
msgid "Unable to stat %s"
-msgstr "%s ¤ò stat ¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
-msgstr "%s ¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
-msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s を作æˆã§ãã¾ã›ã‚“"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "%sinfo ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "%sinfo ã®çŠ¶æ…‹ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
-msgstr "info ¤È temp ¥Ç¥£¥ì¥¯¥È¥ê¤ÏƱ¤¸¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+msgstr "info 㨠temp ディレクトリã¯åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ä¸Šã«ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹"
+msgstr "パッケージリストを読ã¿è¾¼ã‚“ã§ã„ã¾ã™"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "´ÉÍý¥Ç¥£¥ì¥¯¥È¥ê %sinfo ¤Ø¤Î°ÜÆ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "管ç†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %sinfo ã¸ã®ç§»å‹•ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾¼èÆÀÃæ¤ÎÆâÉô¥¨¥é¡¼"
+msgstr "パッケージåå–得中ã®å†…部エラー"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
-msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹"
+msgstr "ファイルリストを読ã¿è¾¼ã‚“ã§ã„ã¾ã™"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1550,284 +1593,280 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"¥ê¥¹¥È¥Õ¥¡¥¤¥ë '%sinfo/%s' ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸µ¤ËÌ᤹¤³"
-"¤È¤¬¤Ç¤­¤Ê¤¤¤Ê¤é¡¢¤½¤ÎÆâÍƤò¶õ¤Ë¤·¤Æ¨ºÂ¤ËƱ¤¸¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºÆ¥¤¥ó"
-"¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤!"
+"リストファイル '%sinfo/%s' ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã™ã“"
+"ã¨ãŒã§ããªã„ãªã‚‰ã€ãã®å†…容を空ã«ã—ã¦å³åº§ã«åŒã˜ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをå†ã‚¤ãƒ³"
+"ストールã—ã¦ãã ã•ã„!"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "¥ê¥¹¥È¥Õ¥¡¥¤¥ë %sinfo/%s ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "リストファイル %sinfo/%s ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢¥Î¡¼¥É¤Î¼èÆÀ"
+msgstr "内部エラーã€ãƒŽãƒ¼ãƒ‰ã®å–å¾—"
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "diversions ¥Õ¥¡¥¤¥ë %sdiversions ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "diversions ファイル %sdiversions ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr "diversion ¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "diversion ファイルãŒå£Šã‚Œã¦ã„ã¾ã™"
#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr "diversion ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¹Ô¤¬¤¢¤ê¤Þ¤¹: %s"
+msgstr "diversion ファイルã«ä¸æ­£ãªè¡ŒãŒã‚ã‚Šã¾ã™: %s"
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ"
+msgstr "内部エラーã€diversion ã®è¿½åŠ "
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr "ºÇ½é¤Ë¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò½é´ü²½¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹"
+msgstr "最åˆã«ãƒ‘ッケージキャッシュをåˆæœŸåŒ–ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Package: ¥Ø¥Ã¥À¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥ª¥Õ¥»¥Ã¥È %lu"
+msgstr "Package: ヘッダを見ã¤ã‘ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚オフセット %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "status ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê ConfFile ¥»¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¥ª¥Õ¥»¥Ã¥È %lu"
+msgstr "status ファイルã«ä¸æ­£ãª ConfFile セクションãŒã‚ã‚Šã¾ã™ã€‚オフセット %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "MD5 ¤Î²òÀÏ¥¨¥é¡¼¡£¥ª¥Õ¥»¥Ã¥È %lu"
+msgstr "MD5 ã®è§£æžã‚¨ãƒ©ãƒ¼ã€‚オフセット %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "'%s' ¥á¥ó¥Ð¤¬¤Ê¤¤¤¿¤á¡¢Àµ¤·¤¤ DEB ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "'%s' メンãƒãƒ¼ãŒãªã„ãŸã‚ã€æ­£ã—ã„ DEB アーカイブã§ã¯ã‚ã‚Šã¾ã›ã‚“"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
msgstr ""
-"'%s' ¤Þ¤¿¤Ï '%s' ¥á¥ó¥Ð¤¬¤Ê¤¤¤¿¤á¡¢¤³¤ì¤ÏÀµ¤·¤¤ DEB ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+"'%s' ã¾ãŸã¯ '%s' メンãƒãƒ¼ãŒãªã„ãŸã‚ã€ã“ã‚Œã¯æ­£ã—ã„ DEB アーカイブã§ã¯ã‚ã‚Šã¾ã›"
+"ã‚“"
#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
-msgstr "%s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s ã«å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-inst/deb/debfile.cc:138
msgid "Internal error, could not locate member"
-msgstr "ÆâÉô¥¨¥é¡¼¡¢¥á¥ó¥Ð¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "内部エラーã€ãƒ¡ãƒ³ãƒãƒ¼ã‚’特定ã§ãã¾ã›ã‚“"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr "Àµ¤·¤¤À©¸æ¥Õ¥¡¥¤¥ë¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "æ­£ã—ã„コントロールファイルを特定ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr "²òÀϤǤ­¤Ê¤¤À©¸æ¥Õ¥¡¥¤¥ë"
+msgstr "解æžã§ããªã„コントロールファイル"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "cdrom ¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤òÆɤߤ³¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "CD-ROM データベース %s を読ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"¤³¤Î CD ¤ò APT ¤Ëǧ¼±¤µ¤»¤ë¤Ë¤Ï apt-cdrom ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¿·¤·¤¤ CD ¤òÄÉ"
-"²Ã¤¹¤ë¤¿¤á¤Ë apt-get update ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£"
+"ã“ã® CD-ROM ã‚’ APT ã«èªè­˜ã•ã›ã‚‹ã«ã¯ apt-cdrom を使用ã—ã¦ãã ã•ã„。新ã—ã„ CD-"
+"ROM を追加ã™ã‚‹ãŸã‚ã« apt-get update ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr "CD ¤¬°ã¤¤¤Þ¤¹"
+msgstr "CD ãŒé•ã„ã¾ã™"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "%s ¤Î CD-ROM ¤Ï»ÈÍÑÃæ¤Î¤¿¤á¥¢¥ó¥Þ¥¦¥ó¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "%s ã® CD-ROM ã¯ä½¿ç”¨ä¸­ã®ãŸã‚アンマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。"
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "ディスクãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
-msgstr "stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "状態ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Êѹ¹»þ¹ï¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "変更時刻ã®è¨­å®šã«å¤±æ•—ã—ã¾ã—ãŸ"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr "ÉÔÀµ¤Ê URI ¤Ç¤¹¡£¥í¡¼¥«¥ë¤Î URI ¤Ï // ¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£"
+msgstr "ä¸æ­£ãª URI ã§ã™ã€‚ローカル㮠URI 㯠// ã§å§‹ã¾ã£ã¦ã¯ã„ã‘ã¾ã›ã‚“"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr "¥í¥°¥¤¥ó¤·¤Æ¤¤¤Þ¤¹"
+msgstr "ログインã—ã¦ã„ã¾ã™"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "¥Ô¥¢¥Í¡¼¥à¤ò·èÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "ピアãƒãƒ¼ãƒ ã‚’決定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
-msgstr "¥í¡¼¥«¥ë¥Í¡¼¥à¤ò·èÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "ローカルãƒãƒ¼ãƒ ã‚’決定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "¥µ¡¼¥Ð¤«¤éÀܳ¤òµñÀ䤵¤ì¤Þ¤·¤¿¡£±þÅú: %s"
+msgstr "サーãƒã‹ã‚‰æŽ¥ç¶šã‚’拒絶ã•ã‚Œã¾ã—ãŸã€‚応答: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
+msgstr "USER 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
+msgstr "PASS 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"¥×¥í¥­¥·¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥í¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
-"Acquire::ftp::ProxyLogin ¤¬¶õ¤Ç¤¹¡£"
+"プロキシサーãƒãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™ãŒã€ãƒ­ã‚°ã‚¤ãƒ³ã‚¹ã‚¯ãƒªãƒ—トãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+"Acquire::ftp::ProxyLogin ãŒç©ºã§ã™ã€‚"
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "¥í¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤Î¥³¥Þ¥ó¥É '%s' ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
+msgstr "ログインスクリプトã®ã‚³ãƒžãƒ³ãƒ‰ '%s' 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE ¼ºÇÔ¡¢¥µ¡¼¥Ð±þÅú: %s"
+msgstr "TYPE 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È"
+msgstr "接続タイムアウト"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀÚÃǤ·¤Þ¤·¤¿"
+msgstr "サーãƒãŒæŽ¥ç¶šã‚’切断ã—ã¾ã—ãŸ"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
-msgstr "Æɤ߹þ¤ß¥¨¥é¡¼"
+msgstr "読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr "¥ì¥¹¥Ý¥ó¥¹¤¬¥Ð¥Ã¥Õ¥¡¤ò¥ª¡¼¥Ð¥Õ¥í¡¼¤µ¤»¤Þ¤·¤¿¡£"
+msgstr "レスãƒãƒ³ã‚¹ãŒãƒãƒƒãƒ•ã‚¡ã‚’オーãƒãƒ•ãƒ­ãƒ¼ã•ã›ã¾ã—ãŸã€‚"
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr "¥×¥í¥È¥³¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "プロトコルãŒå£Šã‚Œã¦ã„ã¾ã™"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
-msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
+msgstr "書ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr "¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
+msgstr "ソケットを作æˆã§ãã¾ã›ã‚“"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£"
+msgstr "データソケットã¸æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚接続ãŒã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
-msgstr "¼õÆ°¥½¥±¥Ã¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "パッシブソケットã«æŽ¥ç¶šã§ãã¾ã›ã‚“。"
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo ¤Ï¥ê¥¹¥Ë¥ó¥°¥Ý¡¼¥È¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "getaddrinfo ã¯ãƒªã‚¹ãƒ‹ãƒ³ã‚°ãƒãƒ¼ãƒˆã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
-msgstr "¥½¥±¥Ã¥È¤ò bind ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ソケットをãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr "¥½¥±¥Ã¥È¤ò listen ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ソケットをリスンã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr "¥½¥±¥Ã¥È¤Î̾Á°¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr "ソケットã®åå‰ã‚’特定ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
-msgstr "PORT ¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó"
+msgstr "PORT コマンドをé€ä¿¡ã§ãã¾ã›ã‚“"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "̤ÃΤΥ¢¥É¥ì¥¹¥Õ¥¡¥ß¥ê %u (AF_*)"
+msgstr "未知ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒª %u (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥µ¡¼¥Ð±þÅú: %s"
+msgstr "EPRT ã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒå¿œç­”: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥ÈÀܳ¥¿¥¤¥à¥¢¥¦¥È"
+msgstr "データソケット接続タイムアウト"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
-msgstr "Àܳ¤ò accept ¤Ç¤­¤Þ¤»¤ó"
+msgstr "接続を accept ã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ç¤ÎÌäÂê"
+msgstr "ファイルã®ãƒãƒƒã‚·ãƒ¥ã§ã®å•é¡Œ"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£¥µ¡¼¥Ð±þÅú '%s'"
+msgstr "ファイルをå–å¾—ã§ãã¾ã›ã‚“。サーãƒå¿œç­” '%s'"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr "¥Ç¡¼¥¿¥½¥±¥Ã¥È¥¿¥¤¥à¥¢¥¦¥È"
+msgstr "データソケットタイムアウト"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "¥Ç¡¼¥¿Å¾Á÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£¥µ¡¼¥Ð±þÅú '%s'"
+msgstr "データ転é€ã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒå¿œç­” '%s'"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "Ì䤤¹ç¤ï¤»"
+msgstr "å•ã„åˆã‚ã›"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
-msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
+msgstr "呼ã³å‡ºã›ã¾ã›ã‚“"
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "%s (%s) ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s (%s) ã¸æŽ¥ç¶šã—ã¦ã„ã¾ã™"
#: methods/connect.cc:71
#, c-format
@@ -1837,517 +1876,531 @@ msgstr "[IP: %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "%s (f=%u t=%u p=%u) ¤ËÂФ¹¤ë¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s (f=%u t=%u p=%u) ã«å¯¾ã™ã‚‹ã‚½ã‚±ãƒƒãƒˆã‚’作æˆã§ãã¾ã›ã‚“"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "%s:%s (%s) ¤Ø¤ÎÀܳ¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "%s:%s (%s) ã¸ã®æŽ¥ç¶šã‚’開始ã§ãã¾ã›ã‚“。"
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿"
+msgstr "%s:%s (%s) ã¸æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚接続ãŒã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr "%s:%s (%s) ã¸æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr "%s ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s ã¸æŽ¥ç¶šã—ã¦ã„ã¾ã™"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
-msgstr "'%s' ¤ò²ò·è¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "'%s' を解決ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "'%s' ¤¬°ì»þŪ¤Ë²ò·è¤Ç¤­¤Þ¤»¤ó"
+msgstr "'%s' ãŒä¸€æ™‚çš„ã«è§£æ±ºã§ãã¾ã›ã‚“"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "'%s:%s' (%i) ¤Î²ò·èÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿"
+msgstr "'%s:%s' (%i) ã®è§£æ±ºä¸­ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸ"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr "%s %s ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó:"
+msgstr "%s %s ã¸æŽ¥ç¶šã§ãã¾ã›ã‚“:"
+
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "'%s' を解決ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Acquire::gpgv::Options ã®å¼•æ•°ãƒªã‚¹ãƒˆãŒé•·ã™ãŽã¾ã™ã€‚終了ã—ã¦ã„ã¾ã™ã€‚"
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部エラー: æ­£ã—ã„ç½²åã§ã™ãŒã€éµæŒ‡ç´‹ã‚’確定ã§ãã¾ã›ã‚“?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "å°‘ãªãã¨ã‚‚ 1 ã¤ã®ä¸æ­£ãªç½²åãŒç™ºè¦‹ã•ã‚Œã¾ã—ãŸã€‚"
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "¥í¥Ã¥¯ %s ¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " ç½²åã®æ¤œè¨¼ (gnupg ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã‹?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "gpgv ã®å®Ÿè¡Œä¸­ã«æœªçŸ¥ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿ"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:"
+msgstr "以下ã®ç½²åãŒç„¡åŠ¹ã§ã™:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+msgstr "公開éµã‚’利用ã§ããªã„ãŸã‚ã€ä»¥ä¸‹ã®ç½²åã¯æ¤œè¨¼ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n"
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "%s ¤ËÂФ·¤Æ¥Ñ¥¤¥×¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s ã«å¯¾ã—ã¦ãƒ‘イプを開ã‘ã¾ã›ã‚“ã§ã—ãŸ"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr "%s ¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
+msgstr "%s プロセスã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr "¥Ø¥Ã¥À¤ÎÂÔµ¡Ãæ¤Ç¤¹"
+msgstr "ヘッダã®å¾…機中ã§ã™"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "%u ʸ»ú¤ò±Û¤¨¤ë 1 ¹Ô¤Î¥Ø¥Ã¥À¤ò¼èÆÀ¤·¤Þ¤·¤¿"
+msgstr "%u 文字を超ãˆã‚‹ 1 è¡Œã®ãƒ˜ãƒƒãƒ€ã‚’å–å¾—ã—ã¾ã—ãŸ"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¹Ô¤Ç¤¹"
+msgstr "ä¸æ­£ãªãƒ˜ãƒƒãƒ€è¡Œã§ã™"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê¥ê¥×¥é¥¤¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
+msgstr "http サーãƒãŒä¸æ­£ãªãƒªãƒ—ライヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Length ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
+msgstr "http サーãƒãŒä¸æ­£ãª Content-Length ヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Range ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿"
+msgstr "http サーãƒãŒä¸æ­£ãª Content-Range ヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr "http ¥µ¡¼¥Ð¤Î¥ì¥ó¥¸¥µ¥Ý¡¼¥È¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "http サーãƒã®ãƒ¬ãƒ³ã‚¸ã‚µãƒãƒ¼ãƒˆãŒå£Šã‚Œã¦ã„ã¾ã™"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
-msgstr "ÉÔÌÀ¤ÊÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤¹"
+msgstr "ä¸æ˜Žãªæ—¥ä»˜ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§ã™"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
-msgstr "select ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "select ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
-msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È"
+msgstr "接続タイムアウト"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "出力ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr "¥ê¥â¡¼¥È¦¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Æ¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "リモートå´ã§æŽ¥ç¶šãŒã‚¯ãƒ­ãƒ¼ã‚ºã•ã‚Œã¦ã‚µãƒ¼ãƒã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
-msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "サーãƒã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¤Ç¤¹"
+msgstr "ä¸æ­£ãªãƒ˜ãƒƒãƒ€ã§ã™"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr "Àܳ¼ºÇÔ"
+msgstr "接続失敗"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
-msgstr "ÆâÉô¥¨¥é¡¼"
+msgstr "内部エラー"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr "¶õ¤Î¥Õ¥¡¥¤¥ë¤ò mmap ¤Ç¤­¤Þ¤»¤ó"
+msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ mmap ã§ãã¾ã›ã‚“"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu ¥Ð¥¤¥È¤Î mmap ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%lu ãƒã‚¤ãƒˆã® mmap ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr "ÁªÂò¤µ¤ì¤¿ %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "é¸æŠžã•ã‚ŒãŸ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Íý²ò¤Ç¤­¤Ê¤¤¾Êά·Á¼°¤Ç¤¹: '%c'"
+msgstr "ç†è§£ã§ããªã„çœç•¥å½¢å¼ã§ã™: '%c'"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "設定ファイル %s をオープンã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
-msgstr "%d ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹ (ºÇÂç¤Ï %d)"
+msgstr "%d 行目ãŒé•·ã™ãŽã¾ã™ (最大 %d)"
#: apt-pkg/contrib/configuration.cc:608
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Ö¥í¥Ã¥¯¤¬Ì¾Á°¤Ê¤·¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "文法エラー %s:%u: ブロックãŒåå‰ãªã—ã§å§‹ã¾ã£ã¦ã„ã¾ã™ã€‚"
#: apt-pkg/contrib/configuration.cc:627
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ÉÔÀµ¤Ê¥¿¥°¤Ç¤¹"
+msgstr "文法エラー %s:%u: ä¸æ­£ãªã‚¿ã‚°ã§ã™"
#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ãͤθå¤Ë;ʬ¤Ê¥´¥ß¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹"
+msgstr "文法エラー %s:%u: 値ã®å¾Œã«ä½™åˆ†ãªã‚´ãƒŸãŒå…¥ã£ã¦ã„ã¾ã™"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ì¿Îá¤Ï¥È¥Ã¥×¥ì¥Ù¥ë¤Ç¤Î¤ß¼Â¹Ô¤Ç¤­¤Þ¤¹"
+msgstr "文法エラー %s:%u: 命令ã¯ãƒˆãƒƒãƒ—レベルã§ã®ã¿å®Ÿè¡Œã§ãã¾ã™"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥¤¥ó¥¯¥ë¡¼¥É¤Î¥Í¥¹¥È¤¬Â¿²á¤®¤Þ¤¹"
+msgstr "文法エラー %s:%u: インクルードã®ãƒã‚¹ãƒˆãŒå¤šã™ãŽã¾ã™"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¤³¤³¤«¤é¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "文法エラー %s:%u: ã“ã“ã‹ã‚‰ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã™"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ̤Âбþ¤ÎÌ¿Îá '%s'"
+msgstr "文法エラー %s:%u: 未対応ã®å‘½ä»¤ '%s'"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë;·×¤Ê¥´¥ß¤¬¤¢¤ê¤Þ¤¹"
+msgstr "文法エラー %s:%u: ファイルã®æœ€å¾Œã«ä½™è¨ˆãªã‚´ãƒŸãŒã‚ã‚Šã¾ã™"
#: apt-pkg/contrib/progress.cc:154
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... ¥¨¥é¡¼!"
+msgstr "%c%s... エラー!"
#: apt-pkg/contrib/progress.cc:156
#, c-format
msgid "%c%s... Done"
-msgstr "%c%s... ´°Î»"
+msgstr "%c%s... 完了"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó '%c' [%s ¤«¤é] ¤ÏÉÔÌÀ¤Ç¤¹¡£"
+msgstr "コマンドラインオプション '%c' [%s ã‹ã‚‰] ã¯ä¸æ˜Žã§ã™ã€‚"
#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó %s ¤òÍý²ò¤Ç¤­¤Þ¤»¤ó"
+msgstr "コマンドラインオプション %s ã‚’ç†è§£ã§ãã¾ã›ã‚“"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó %s ¤Ï boolean ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "コマンドラインオプション %s 㯠boolean ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr "¥ª¥×¥·¥ç¥ó %s ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹¡£"
+msgstr "オプション %s ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ã€‚"
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "¥ª¥×¥·¥ç¥ó %s: ÀßÄê¹àÌÜ¤Ë¤Ï =<ÃÍ> ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+msgstr "オプション %s: 設定項目ã«ã¯ =<値> を指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "¥ª¥×¥·¥ç¥ó %s ¤Ë¤Ï '%s' ¤Ç¤Ï¤Ê¤¯À°¿ô¤Î°ú¿ô¤¬É¬ÍפǤ¹"
+msgstr "オプション %s ã«ã¯ '%s' ã§ã¯ãªãæ•´æ•°ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "¥ª¥×¥·¥ç¥ó '%s' ¤ÏŤ¹¤®¤Þ¤¹"
+msgstr "オプション '%s' ã¯é•·ã™ãŽã¾ã™"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "%s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£true ¤« false ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr "%s を解釈ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。true ã‹ false を試ã—ã¦ãã ã•ã„。"
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
msgid "Invalid operation %s"
-msgstr "ÉÔÀµ¤ÊÁàºî %s"
+msgstr "ä¸æ­£ãªæ“作 %s"
#: apt-pkg/contrib/cdromutl.cc:55
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó"
+msgstr "マウントãƒã‚¤ãƒ³ãƒˆ %s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr "%s ¤ØÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+msgstr "%s ã¸å¤‰æ›´ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr "cdrom ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "cdrom ã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Æɤ߹þ¤ßÀìÍѤΥí¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ë¥í¥Ã¥¯¤Ï»ÈÍѤ·¤Þ¤»¤ó"
+msgstr "読ã¿è¾¼ã¿å°‚用ã®ãƒ­ãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã«ãƒ­ãƒƒã‚¯ã¯ä½¿ç”¨ã—ã¾ã›ã‚“"
#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
-msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
+msgstr "ロックファイル %s をオープンã§ãã¾ã›ã‚“"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¥í¥Ã¥¯¤ò»ÈÍѤ·¤Þ¤»¤ó"
+msgstr "nfs マウントã•ã‚ŒãŸãƒ­ãƒƒã‚¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã«ã¯ãƒ­ãƒƒã‚¯ã‚’使用ã—ã¾ã›ã‚“"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
-msgstr "¥í¥Ã¥¯ %s ¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ロック %s ãŒå–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:377
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "%s ¤òÂÔ¤Á¤Þ¤·¤¿¤¬¡¢¤½¤³¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s ã‚’å¾…ã¡ã¾ã—ãŸãŒã€ãã“ã«ã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó°ãÈ¿¤ò¼õ¤±¤È¤ê¤Þ¤·¤¿¡£"
+msgstr "å­ãƒ—ロセス %s ãŒã‚»ã‚°ãƒ¡ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³é•åã‚’å—ã‘å–ã‚Šã¾ã—ãŸã€‚"
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥¨¥é¡¼¥³¡¼¥É (%u) ¤òÊÖ¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセス %s ãŒã‚¨ãƒ©ãƒ¼ã‚³ãƒ¼ãƒ‰ (%u) ã‚’è¿”ã—ã¾ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬Í½´ü¤»¤º½ªÎ»¤·¤Þ¤·¤¿"
+msgstr "å­ãƒ—ロセス %s ãŒäºˆæœŸã›ãšçµ‚了ã—ã¾ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
-msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ファイル %s をオープンã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "Æɤ߹þ¤ß¤¬ %lu »Ä¤Ã¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¤¬¡¢²¿¤â»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó"
+msgstr "読ã¿è¾¼ã¿ãŒ %lu 残ã£ã¦ã„ã‚‹ã¯ãšã§ã™ãŒã€ä½•ã‚‚残ã£ã¦ã„ã¾ã›ã‚“"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "¤¢¤È %lu ½ñ¤­¹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "ã‚㨠%lu 書ã込む必è¦ãŒã‚ã‚Šã¾ã™ãŒã€æ›¸ã込むã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
+msgstr "ファイルã®ã‚¯ãƒ­ãƒ¼ã‚ºä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
+msgstr "ファイルã®å‰Šé™¤ä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr "¥Õ¥¡¥¤¥ë¤Î sync ¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
+msgstr "ファイルã®åŒæœŸä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr "¶õ¤Î¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å"
+msgstr "空ã®ãƒ‘ッケージキャッシュ"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "パッケージキャッシュファイルãŒå£Šã‚Œã¦ã„ã¾ã™"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤Ï¸ß´¹À­¤¬¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹"
+msgstr "ã“ã®ãƒ‘ッケージキャッシュファイルã¯äº’æ›æ€§ãŒãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™"
#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "¤³¤Î APT ¤Ï¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à '%s' ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
+msgstr "ã“ã® APT ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ‹ãƒ³ã‚°ã‚·ã‚¹ãƒ†ãƒ  '%s' をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤¬°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤ˹½ÃÛ¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "パッケージキャッシュãŒç•°ãªã‚‹ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ç”¨ã«æ§‹ç¯‰ã•ã‚Œã¦ã„ã¾ã™"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
-msgstr "°Í¸"
+msgstr "ä¾å­˜"
#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
-msgstr "Àè¹Ô°Í¸"
+msgstr "先行ä¾å­˜"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr "Äó°Æ"
+msgstr "æ案"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
-msgstr "¿ä¾©"
+msgstr "推奨"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr "¶¥¹ç"
+msgstr "競åˆ"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
-msgstr "ÃÖ´¹"
+msgstr "ç½®æ›"
#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
-msgstr "ÇÑ»ß"
+msgstr "廃止"
#: apt-pkg/pkgcache.cc:231
msgid "important"
-msgstr "½ÅÍ×"
+msgstr "é‡è¦"
#: apt-pkg/pkgcache.cc:231
msgid "required"
-msgstr "Í×µá"
+msgstr "è¦æ±‚"
#: apt-pkg/pkgcache.cc:231
msgid "standard"
-msgstr "ɸ½à"
+msgstr "標準"
#: apt-pkg/pkgcache.cc:232
msgid "optional"
-msgstr "Ǥ°Õ"
+msgstr "ä»»æ„"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
-msgstr "ÆÃÊÌ"
+msgstr "特別"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
-msgstr "°Í¸´Ø·¸¥Ä¥ê¡¼¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹"
+msgstr "ä¾å­˜é–¢ä¿‚ツリーを作æˆã—ã¦ã„ã¾ã™"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
-msgstr "¸õÊä¥Ð¡¼¥¸¥ç¥ó"
+msgstr "候補ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
-msgstr "°Í¸´Ø·¸¤ÎÀ¸À®"
+msgstr "ä¾å­˜é–¢ä¿‚ã®ç”Ÿæˆ"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "入手å¯èƒ½æƒ…報をマージã—ã¦ã„ã¾ã™"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸ"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ファイル %s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (1)"
+msgstr "パッケージファイル %s を解釈ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (2)"
+msgstr "パッケージファイル %s を解釈ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI)"
+msgstr "ソースリスト %2$s ã® %1$lu 行目ãŒä¸æ­£ã§ã™ (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist)"
+msgstr "ソースリスト %2$s ã® %1$lu 行目ãŒä¸æ­£ã§ã™ (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI parse)"
+msgstr "ソースリスト %2$s ã® %1$lu 行目ãŒä¸æ­£ã§ã™ (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (absolute dist)"
+msgstr "ソースリスト %2$s ã® %1$lu 行目ãŒä¸æ­£ã§ã™ (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist parse)"
+msgstr "ソースリスト %2$s ã® %1$lu 行目ãŒä¸æ­£ã§ã™ (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s をオープンã—ã¦ã„ã¾ã™"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£"
+msgstr "ソースリスト %2$s ã® %1$u 行目ãŒé•·ã™ãŽã¾ã™ã€‚"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (type)"
+msgstr "ソースリスト %2$s ã® %1$u 行目ãŒä¸æ­£ã§ã™ (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤Ë¤¢¤ë¥¿¥¤¥× '%1$s' ¤ÏÉÔÌÀ¤Ç¤¹"
+msgstr "ソースリスト %3$s ã® %2$u è¡Œã«ã‚るタイプ '%1$s' ã¯ä¸æ˜Žã§ã™"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (vendor id)"
+msgstr "ソースリスト %2$s ã® %1$u 行目ãŒä¸æ­£ã§ã™ (vendor id)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2356,235 +2409,245 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢¶¥¹ç/Àè¹Ô°Í¸¤Î¥ë¡¼¥×¤¬¸¶°ø¤Ç¡¢°ì»þŪ¤Ë½ÅÍפÊÉԲķç¥Ñ¥Ã"
-"¥±¡¼¥¸ %s ¤òºï½ü¤·¤Þ¤¹¡£¤³¤ì¤Ï¿¤¯¤Î¾ì¹ç¤ËÌäÂ꤬µ¯¤³¤ë¸¶°ø¤È¤Ê¤ê¤Þ¤¹¡£ËÜÅö¤Ë"
-"¤³¤ì¤ò¹Ô¤¤¤¿¤¤¤Ê¤é¡¢APT::Force-LoopBreak ¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯ã€ç«¶åˆ/先行ä¾å­˜ã®ãƒ«ãƒ¼ãƒ—ãŒåŽŸå› ã§ã€ä¸€æ™‚çš„ã«é‡è¦ãªä¸å¯æ¬ ãƒ‘ッ"
+"ケージ %s を削除ã—ã¾ã™ã€‚ã“ã‚Œã¯å¤šãã®å ´åˆã«å•é¡ŒãŒèµ·ã“る原因ã¨ãªã‚Šã¾ã™ã€‚本当ã«"
+"ã“れを行ã„ãŸã„ãªã‚‰ã€APT::Force-LoopBreak オプションを有効ã«ã—ã¦ãã ã•ã„。"
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥× '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "インデックスファイルã®ã‚¿ã‚¤ãƒ— '%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¤¿¤á¤Î¥¢¡¼¥«¥¤¥Ö¤ò¸«"
-"¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+"パッケージ %s ã‚’å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ãŒã€ãã®ãŸã‚ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を見"
+"ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"¥¨¥é¡¼¡¢pkgProblemResolver::Resolve ¤ÏÄä»ß¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼"
-"¥¸¤¬¸¶°ø¤Ç¤¹¡£"
+"エラーã€pkgProblemResolver::Resolve ã¯åœæ­¢ã—ã¾ã—ãŸã€‚ãŠãらã変更ç¦æ­¢ãƒ‘ッケー"
+"ジãŒåŽŸå› ã§ã™ã€‚"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
-msgstr "ÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£²õ¤ì¤¿Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£"
+msgstr "å•é¡Œã‚’解決ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。壊れãŸå¤‰æ›´ç¦æ­¢ãƒ‘ッケージãŒã‚ã‚Šã¾ã™ã€‚"
#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "¥ê¥¹¥È¥Ç¥£¥ì¥¯¥È¥ê %spartial ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
+msgstr "リストディレクトリ %spartial ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê %spartial ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
+msgstr "アーカイブディレクトリ %spartial ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ファイルをダウンロードã—ã¦ã„ã¾ã™ %li/%li (残り %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "ファイルリストを読ã¿è¾¼ã‚“ã§ã„ã¾ã™"
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
-msgstr "¥á¥½¥Ã¥É¥É¥é¥¤¥Ð %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
+msgstr "メソッドドライム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
-msgstr "¥á¥½¥Ã¥É %s ¤¬Àµ¾ï¤Ë³«»Ï¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "メソッド %s ãŒæ­£å¸¸ã«é–‹å§‹ã—ã¾ã›ã‚“ã§ã—ãŸ"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"¥á¥Ç¥£¥¢Êѹ¹: \n"
-" '%s'\n"
-"¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n"
+"'%s' ã¨ãƒ©ãƒ™ãƒ«ã®ä»˜ã„ãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ドライブ '%s' ã«å…¥ã‚Œã¦ enter を押ã—ã¦ãã ã•"
+"ã„。"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¥·¥¹¥Æ¥à '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "パッケージングシステム '%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
-msgstr "ŬÀڤʥѥ屡¼¥¸¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "é©åˆ‡ãªãƒ‘ッケージシステムタイプを特定ã§ãã¾ã›ã‚“"
#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
-msgstr "%s ¤ò stat ¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "%s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“。"
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list ¤Ë '¥½¡¼¥¹' URI ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
+msgstr "sources.list ã« 'ソース' URI を指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Þ¤¿¤Ï¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë¤ò²ò¼á¤Þ¤¿¤Ï¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ"
-"¤»¤ó¡£"
+"パッケージリストã¾ãŸã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’解釈ã¾ãŸã¯ã‚ªãƒ¼ãƒ—ンã™ã‚‹ã“ã¨ãŒã§ãã¾"
+"ã›ã‚“。"
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-"¤³¤ì¤é¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¤Ï apt-get update ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ"
-"¤»¤ó"
+"ã“れらã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã«ã¯ apt-get update を実行ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾"
+"ã›ã‚“"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-"ÉÔÀµ¤Ê¥ì¥³¡¼¥É¤¬ preferences ¥Õ¥¡¥¤¥ë¤Ë¸ºß¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤¬¤¢¤ê¤Þ¤»"
-"¤ó"
+"ä¸æ­£ãªãƒ¬ã‚³ãƒ¼ãƒ‰ãŒ preferences ファイルã«å­˜åœ¨ã—ã¾ã™ã€‚パッケージヘッダãŒã‚ã‚Šã¾ã›"
+"ã‚“"
#: apt-pkg/policy.cc:291
#, c-format
msgid "Did not understand pin type %s"
-msgstr "pin ¥¿¥¤¥× %s ¤¬Íý²ò¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "pin タイプ %s ãŒç†è§£ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
-msgstr "pin ¤ÇÍ¥ÀèÅÙ (¤Þ¤¿¤Ï 0) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "pin ã§å„ªå…ˆåº¦ (ã¾ãŸã¯ 0) ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
-msgstr "¥­¥ã¥Ã¥·¥å¤ËÈó¸ß´¹¤Ê¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à¤¬¤¢¤ê¤Þ¤¹"
+msgstr "キャッシュã«éžäº’æ›ãªãƒãƒ¼ã‚¸ãƒ§ãƒ‹ãƒ³ã‚°ã‚·ã‚¹ãƒ†ãƒ ãŒã‚ã‚Šã¾ã™"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewPackage)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage1)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage2)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewFileVer1)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion1)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage3)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion2)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¡£"
+msgstr "ã“ã® APT ãŒå¯¾å¿œã—ã¦ã„る以上ã®æ•°ã®ãƒ‘ッケージãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£"
+msgstr "ã“ã® APT ãŒå¯¾å¿œã—ã¦ã„る以上ã®æ•°ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¦æ±‚ã•ã‚Œã¾ã—ãŸã€‚"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î°Í¸´Ø·¸¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
+msgstr "ã“ã® APT ãŒå¯¾å¿œã—ã¦ã„る以上ã®æ•°ã®ä¾å­˜é–¢ä¿‚ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (FindPkg)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (CollectFileProvides)"
+msgstr "%s を処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s %s ¤¬¥Õ¥¡¥¤¥ë°Í¸¤Î½èÍýÃæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "パッケージ %s %s ãŒãƒ•ã‚¡ã‚¤ãƒ«ä¾å­˜ã®å‡¦ç†ä¸­ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È %s ¤¬ stat ¤Ç¤­¤Þ¤»¤ó"
+msgstr "ソースパッケージリスト %s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
-msgstr "¥Õ¥¡¥¤¥ëÄ󶡾ðÊó¤ò¼ý½¸¤·¤Æ¤¤¤Þ¤¹"
+msgstr "ファイルæ供情報をåŽé›†ã—ã¦ã„ã¾ã™"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
-msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ÎÊݸÃæ¤Ë IO ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+msgstr "ソースキャッシュã®ä¿å­˜ä¸­ã« IO エラーãŒç™ºç”Ÿã—ã¾ã—ãŸ"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)"
+msgstr "åå‰ã®å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
-msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó"
+msgstr "MD5Sum ãŒé©åˆã—ã¾ã›ã‚“"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下ã®éµ ID ã«å¯¾ã—ã¦åˆ©ç”¨å¯èƒ½ãªå…¬é–‹éµãŒã‚ã‚Šã¾ã›ã‚“:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°"
-"¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£"
+"パッケージ %s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½ç½®ã‚’特定ã§ãã¾ã›ã‚“。ãŠãらãã“ã®ãƒ‘ッケージを手動"
+"ã§ä¿®æ­£ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ (存在ã—ãªã„アーキテクãƒãƒ£ã®ãŸã‚)。"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°"
-"¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+"パッケージ %s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½ç½®ã‚’特定ã§ãã¾ã›ã‚“。ãŠãらãã“ã®ãƒ‘ッケージを手動"
+"ã§ä¿®æ­£ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: "
-"¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£"
+"パッケージインデックスファイルãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚パッケージ %s ã« Filename: "
+"フィールドãŒã‚ã‚Šã¾ã›ã‚“。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
-msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó"
+msgstr "サイズãŒé©åˆã—ã¾ã›ã‚“"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "¥Ù¥ó¥À¥Ö¥í¥Ã¥¯ %s ¤Ï¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
+msgstr "ベンダブロック %s ã¯ãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ—リントをå«ã‚“ã§ã„ã¾ã›ã‚“"
#: apt-pkg/cdrom.cc:507
#, c-format
@@ -2592,50 +2655,50 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-"CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n"
-"CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n"
+"CD-ROM マウントãƒã‚¤ãƒ³ãƒˆ %s を使用ã—ã¾ã™\n"
+"CD-ROM をマウントã—ã¦ã„ã¾ã™\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
-msgstr "³Îǧ¤·¤Æ¤¤¤Þ¤¹.. "
+msgstr "確èªã—ã¦ã„ã¾ã™.. "
#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
-msgstr "³ÊǼ¤µ¤ì¤¿¥é¥Ù¥ë: %s \n"
+msgstr "æ ¼ç´ã•ã‚ŒãŸãƒ©ãƒ™ãƒ«: %s \n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n"
+msgstr "CD-ROM マウントãƒã‚¤ãƒ³ãƒˆ %s を使用ã—ã¾ã™\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n"
+msgstr "CD-ROM をアンマウントã—ã¦ã„ã¾ã™\n"
#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
-msgstr "¥Ç¥£¥¹¥¯¤òÂԤäƤ¤¤Þ¤¹...\n"
+msgstr "ディスクを待ã£ã¦ã„ã¾ã™ ...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹...\n"
+msgstr "CD-ROM をマウントã—ã¦ã„ã¾ã™ ...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr "¥Ç¥£¥¹¥¯¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÁöºº¤·¤Æ¤¤¤Þ¤¹..\n"
+msgstr "ディスクã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’走査ã—ã¦ã„ã¾ã™ ..\n"
#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-"%i ¤Î¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î½ð̾¤ò¸«¤Ä¤±¤Þ¤·"
-"¤¿\n"
+"%i ã®ãƒ‘ッケージインデックスã€%i ã®ã‚½ãƒ¼ã‚¹ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€%i ã®ç½²åを見ã¤ã‘ã¾ã—"
+"ãŸ\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr "¤³¤ì¤ÏÍ­¸ú¤Ê̾Á°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ºÆ»î¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+msgstr "ã“ã‚Œã¯æœ‰åŠ¹ãªåå‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“。å†è©¦è¡Œã—ã¦ãã ã•ã„。\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2643,100 +2706,112 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"¤³¤Î¥Ç¥£¥¹¥¯¤Ï°Ê²¼¤Î¤è¤¦¤Ë¸Æ¤Ð¤ì¤Þ¤¹: \n"
+"ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«å‘¼ã°ã‚Œã¾ã™: \n"
"'%s'\n"
#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò¥³¥Ô¡¼¤·¤Æ¤¤¤Þ¤¹..."
+msgstr "パッケージリストをコピーã—ã¦ã„ã¾ã™ ..."
#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
-msgstr "¿·¤·¤¤¥½¡¼¥¹¥ê¥¹¥È¤ò½ñ¤­¹þ¤ó¤Ç¤¤¤Þ¤¹\n"
+msgstr "æ–°ã—ã„ソースリストを書ã込んã§ã„ã¾ã™\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Î¥½¡¼¥¹¥ê¥¹¥È¤Î¥¨¥ó¥È¥ê:\n"
+msgstr "ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã®ã‚½ãƒ¼ã‚¹ãƒªã‚¹ãƒˆã®ã‚¨ãƒ³ãƒˆãƒª:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
-msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹..."
+msgstr "CD-ROM をアンマウントã—ã¦ã„ã¾ã™ ..."
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
-msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£\n"
+msgstr "%i レコードを書ãè¾¼ã¿ã¾ã—ãŸã€‚\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
+msgstr "%i レコードを書ãè¾¼ã¿ã¾ã—ãŸã€‚%i 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå­˜åœ¨ã—ã¾ã›ã‚“。\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "%i レコードを書ãè¾¼ã¿ã¾ã—ãŸã€‚%i 個ã®é©åˆã—ãªã„ファイルãŒã‚ã‚Šã¾ã™ã€‚\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-"%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤º¡¢%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤"
-"¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n"
+"%i レコードを書ãè¾¼ã¿ã¾ã—ãŸã€‚%i 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚‰ãšã€%i 個ã®é©åˆã—ãªã„"
+"ファイルãŒã‚ã‚Šã¾ã™ã€‚\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s を準備ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s を展開ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s ã®è¨­å®šã‚’準備ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "%s ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s を設定ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: "
+msgstr "%s をインストールã—ã¾ã—ãŸ"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s ã®å‰Šé™¤ã‚’準備ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹"
+msgstr "%s を削除ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "¿ä¾©"
+msgstr "%s を削除ã—ã¾ã—ãŸ"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s ã®è¨­å®šã‚’準備ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿"
+msgstr "途中ã§æŽ¥ç¶šãŒã‚¯ãƒ­ãƒ¼ã‚ºã•ã‚Œã¾ã—ãŸ"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "ファイル %s ã®æ—¥ä»˜ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™"
+
+#~ msgid "Reading file list"
+#~ msgstr "ファイルリストを読ã¿è¾¼ã‚“ã§ã„ã¾ã™"
+
+#~ msgid "Could not execute "
+#~ msgstr "実行ã§ãã¾ã›ã‚“ã§ã—ãŸ:"
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "設定 %s ã®å‰Šé™¤ã‚’準備ã—ã¦ã„ã¾ã™"
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤ËÉÔÌÀ¤Ê¥Ù¥ó¥À ID '%1$s' ¤¬¤¢¤ê¤Þ¤¹"
+#~ msgid "Removed with config %s"
+#~ msgstr "設定 %s を削除ã—ã¾ã—ãŸ"
diff --git a/po/km.po b/po/km.po
new file mode 100644
index 000000000..a5613cfef
--- /dev/null
+++ b/po/km.po
@@ -0,0 +1,2732 @@
+# translation of apt_po_km.po to
+# This file is put in the public domain.
+#
+# Eng Vannak <evannak@khmeros.info>, 2006.
+# Poch Sokun <sokun_poch@khmeros.info>, 2006.
+# auk piseth <piseth_dv@khmeros.info>, 2006.
+# Leang Chumsoben <soben@khmeros.info>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: apt_po_km\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
+"PO-Revision-Date: 2006-06-22 08:49+0700\n"
+"Last-Translator: Leang Chumsoben <soben@khmeros.info>\n"
+"Language-Team: <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រáŸáž™â€‹áž˜áž·áž“​ážáŸ’រូវ​គ្នា ៖\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "មិន​អាច​កំណážáŸ‹â€‹áž‘ីážáž¶áŸ†áž„​កញ្ចប់ %s បានឡើយ"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
+
+#: cmdline/apt-cache.cc:272
+msgid " Normal packages: "
+msgstr " កញ្ចប់​ធម្មážáž¶Â áŸ– "
+
+#: cmdline/apt-cache.cc:273
+msgid " Pure virtual packages: "
+msgstr " កញ្ចប់​និម្មិážâ€‹ážŸáž»áž‘្ធ ៖ "
+
+#: cmdline/apt-cache.cc:274
+msgid " Single virtual packages: "
+msgstr " កញ្ចប់​និម្មិážâ€‹ážáŸ‚​មួយ ៖ "
+
+#: cmdline/apt-cache.cc:275
+msgid " Mixed virtual packages: "
+msgstr " កញ្ចប់​និម្មិážâ€‹áž›áž¶áž™Â áŸ– "
+
+#: cmdline/apt-cache.cc:276
+msgid " Missing: "
+msgstr " បាážáŸ‹áž”ង់ ៖ "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "កំណែ​ផ្សáŸáž„ៗ​សរុប ៖ "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "ភាព​អាស្រáŸáž™â€‹ážŸážšáž»áž” ៖ "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "ážáŸ’សែ​អក្សរ​សរុប​ ៖ "
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "ទំហំ​កំណែ​ភាព​អាស្រáŸáž™â€‹ážŸážšáž»áž” ៖ "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "ទំហំ slack សរុប ៖"
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ážáž¶áž„ក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "អ្នក​ážáŸ’រូវ​ážáŸ‚​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិážâ€‹áž”្រាកដ"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "រក​កញ្ចប់​មិន​ឃើញ"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "ឯកសារ​កញ្ចប់ ៖"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "ឃ្លាំង​សម្ងាážáŸ‹â€‹áž‹áž·ážáž“ៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទáŸ"
+
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "កញ្ចប់​ដែល​បាន​ážáŸ’ទាស់ ៖"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(រក​មិន​ឃើញ)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid " Installed: "
+msgstr " បាន​ដំឡើង ៖ "
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(គ្មាន)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid " Candidate: "
+msgstr " សាកល្បង ៖ "
+
+#: cmdline/apt-cache.cc:1532
+msgid " Package pin: "
+msgstr " ážáŸ’ទាស់​កញ្ចប់ ៖ "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid " Version table:"
+msgstr " ážáž¶ážšáž¶áž„​កំណែ ៖"
+
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"ការ​ប្រើប្រាស់ ៖ apt-cache [options] ពាក្យ​បញ្ជា\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache គឺ​ជា​ឧបករណáŸâ€‹áž€áž˜áŸ’ážšáž·ážáž‘ាប​​ដែល​ប្រើ​សម្រាប់​រៀបចំ​ប្រពáŸáž“្ធ​គោល​ពីរ​របស់ APT\n"
+"ឯកសារ​ឃ្លាំង​សម្ងាážáŸ‹ áž“áž·áž„ ​ពáŸážáŸŒáž˜áž¶áž“​សំណួរ​ពី​ពួក​វា\n"
+"\n"
+"ពាក្យ​បញ្ជា\n"
+" add - បន្ážáŸ‚ម​ឯកសារ​កញ្ចប់​ទៅ​ឃ្លាំង​សម្ងាážáŸ‹â€‹áž”្រភព\n"
+" gencaches - បង្កើážâ€‹áž‘ាំង​​កញ្ចប់​និង​ឃ្លាំង​សម្ងាážáŸ‹â€‹áž”្រភព\n"
+" showpkg - បង្ហាញ​ពáŸážáŸŒáž˜áž¶áž“​ទូទៅ​ážáŸ’លះ​សម្រាប់​កញ្ចប់​ážáŸ‚​មួយ\n"
+" showsrc - បង្ហាញ​កំណážáŸ‹â€‹ážáŸ’រា​ប្រភព\n"
+" stats - បង្ហាញ​ស្ážáž·ážáž·â€‹áž˜áž¼áž›ážŠáŸ’ឋាន​ážáŸ’លះ\n"
+" dump - បង្ហាញ​ឯកសារ​ទាំងមូល​ក្នុង​ទ្រង់ទ្រាយ​សង្ážáŸáž”\n"
+" dumpavail - បោះពុម្ព​ឯកសារ​ដែល​មាន​ទៅ stdout\n"
+" unmet - បង្ហាញ​ភាពអាស្រáŸáž™â€‹ unmet \n"
+" search - ស្វែងរក​កញ្ចប់​​លំនាំ regex \n"
+" show - បង្ហាញ​កំណážáŸ‹â€‹ážáŸ’រា​កញ្ចប់​ដែល​អាច​អាន​បាន\n"
+" depends - បង្ហាញពáŸážáŸŒáž˜áž¶áž“​​ភាពអាស្រáŸáž™â€‹áž€áž‰áŸ’ចប់​មិន​ទាន់​ច្នៃ\n"
+" rdepends - បង្ហាញ​ពáŸážáŸŒáž˜áž¶áž“​ភាពអាស្រáŸáž™â€‹áž€áž‰áŸ’ចប់​បញ្ច្រាស់​\n"
+" pkgnames - រាយ​ឈ្មោះ​កញ្ចប់​ទាំងអស់​\n"
+" dotty - បង្កើážâ€‹áž€áž‰áŸ’ចប់​ក្រាហ្វ​សម្រាប់​ GraphVis\n"
+" xvcg - បង្កើážâ€‹áž€áž‰áŸ’ចប់​ក្រាហ្វ​សម្រាប់​ xvcg\n"
+" policy - បង្ហាញ ការរៀបចំ​គោលការណáŸâ€‹\n"
+"\n"
+"ជម្រើស​ ៖\n"
+" -h áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢ážáŸ’ážáž‡áŸ†áž“ួយ​\n"
+" -p=? ឃ្លាំងសម្ងាážáŸ‹â€‹áž€áž‰áŸ’ចប់​ ។\n"
+" -s=? ឃ្លាំងសម្ងាážáŸ‹â€‹áž”្រភព ។\n"
+" -q ទ្រនិច​ចង្អុល​វឌ្ážáž“ភាព មិន​អនុញ្ញាážâ€‹Â áŸ”\n"
+" -i បាន​ážáŸ‚​បង្ហាញ áž–áŸážáŸŒáž˜áž¶áž“​ deps ដែល​សំážáž¶áž“់​សម្រាប់ពាក្យ​បញ្ជាដែល​ážáž»ážŸâ€‹áž‚្នា  ​​​។\n"
+" -c=? អាន​ការកំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឯកសារ​នáŸáŸ‡ \n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ការ​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ážáž¶áž˜â€‹áž…áž·ážáŸ’ហឧ. eg -o dir::cache=/tmp\n"
+"មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ពáŸážáŸŒáž˜áž¶áž“​បន្ážáŸ‚ម​​មាន​ក្នុង​ទំពáŸážšâ€‹ážŸáŸ€ážœáž—ៅដៃ​ ។\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ážáž¶ážŸâ€‹áž“áŸáŸ‡ ឧទាហរណáŸâ€‹ážŠáž¼áž…ជា 'ដáŸáž”ៀន 2.1r1 ážáž¶ážŸâ€‹áž‘ី ១' ជាដើម"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "សូម​បញ្ចូល​ážáž¶ážŸâ€‹áž€áŸ’នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "ធ្វើដំណើរការ​នáŸáŸ‡â€‹áž˜áŸ’ážáž„​ទៀážâ€‹ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "​អាគុយម៉ង់​មិន​មាន​គូ​ទáŸ"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការ​ប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-config [ជម្រើស] \n"
+"\n"
+"apt-config ជា​ឧបករណáŸâ€‹ážŸáž¶áž˜áž‰áŸ’ញ​សម្រាប់​អាន​ឯកសារ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ​ APT \n"
+"\n"
+"ពាក្យ​បញ្ជា​ ៖\n"
+" shell - របៀប​សែល​\n"
+" dump - បង្ហាញ​ការកំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​\n"
+"\n"
+"ជម្រើស​\n"
+" -h អážáŸ’ážáž“ទ​ជំនួយ​នáŸáŸ‡â€‹\n"
+" -c=? អាន​ឯកសារ​ការកំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​នáŸáŸ‡ \n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ការ​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ážáž¶áž˜â€‹áž…áž·ážáŸ’ហឧ. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ážáŸ’រឹមážáŸ’រូវ​ទáŸâ€‹Â áŸ”"
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណáŸážŠáž¾áž˜áŸ’បី​ស្រង់​ពáŸážáŸŒáž˜áž¶áž“​ការ​រចនាសម្ពáŸáž“្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដáŸáž”ៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+" -h អážáŸ’ážáž”ទ​ជំនួយ​\n"
+" -t កំណážáŸ‹â€‹ážážâ€‹áž”ណ្ដោះ​អាសន្ន\n"
+" -c=? អាន​ឯកសារ​ការ​កំណážáŸ‹â€‹ážšáž…នាស្ពáŸáž“្ធ​នáŸáŸ‡\n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ការ​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ážáž¶áž˜â€‹áž…áž·ážáŸ’ហឧ. eg -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរសáŸážšâ€‹áž‘ៅ %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ ážáž¾â€‹ debconf បានដំឡើង​ឬ ?"
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ážáŸ‚ម​កញ្ចប់​វែង​ពáŸáž€"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "​កំហុស​ដំណើរការ​ážážâ€‹ %s"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ážáŸ‚ម​ប្រភព​វែង​ពáŸáž€"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "កំហុស​សរសáŸážšâ€‹áž”ឋម​កážáž¶â€‹áž‘ៅ​ឯកសារ​មាážáž·áž€áž¶"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "កំហុស​ដំណើរការ​មាážáž·áž€áž¶â€‹ %s"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n"
+"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" ផ្លូវ​មាážáž·áž€áž¶â€‹\n"
+" ផ្លូវ​ផ្សាយ​ចáŸáž‰ \n"
+" កំណážáŸ‹â€‹ážšáž…នាស្ពáŸáž“្ធបង្កើážâ€‹ [groups]\n"
+" ​​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធសំអាážâ€‹â€‹\n"
+"\n"
+"apt-ftparchive បង្កើážâ€‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž›áž·áž”ិក្រម​សម្រាប់​បáŸážŽáŸ’ណសារ​​ដáŸáž”ៀន  ។ វា​គាំទ្រ​រចនាបáŸáž‘្ម​នៃ​ការបង្កើážážŠáŸ„យ​"
+"ស្វáŸáž™áž”្រវážáŸ’ážáž·â€‹\n"
+"ដើម្បី​ធ្វើការ​ជំនួស​\n"
+" dpkg-scanpackages áž“áž·áž„ dpkg-scansources\n"
+"\n"
+"apt-ftparchive ដែល​បង្កើážâ€‹â€‹â€‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž‰áŸ’ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n"
+"​មាážáž·áž€áž¶â€‹áž“ៃ ážœážáŸ’ážáž»áž”ញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​"
+"បដិសáŸáž’​​មិន​គាំទ្រ​ \n"
+"ដើម្បី​បង្ážáŸ†â€‹ážáž˜áŸ’លៃ​អាទិភាព​និង សមáŸáž™â€‹Â áŸ”\n"
+"\n"
+"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž”្រភព​ពី​មែកធាង​ .dscs ។\n"
+"ជម្រើស​បដិសáŸáž’​ប្រភព​អាច​ážáŸ’រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសáŸáž’ src \n"
+"\n"
+" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ážáŸ’រូវ​​ážáŸ‚​រážáŸ‹â€‹áž‡áž¶â€‹ root \n"
+" ។ BinaryPath ážáŸ’រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ážáŸ’លួនឯង​ ហើយ​ \n"
+"ឯកសារ​បដិសáŸáž’​ážáŸ’រូវមាន​ទង​បដិសáŸáž’  ។ ផ្លូវ​បរិបទ​ážáŸ’រូវ​បាន​បន្ážáŸ‚ម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ "
+"ឧទាហរណáŸâ€‹ ការប្រើប្រាស់​ពី​បáŸážŽáŸ’ណសារ​ \n"
+"ដáŸáž”ៀន  ៖\n"
+" apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ជម្រើស​ ៖\n"
+" -h អážáŸ’ážáž”ទ​ជំនួយ​នáŸáŸ‡â€‹\n"
+" --md5 Control MD5 ការបបង្កើážâ€‹\n"
+" -s=? ឯកសារ​បដិសáŸáž’​ប្រភព​\n"
+" -q Quiet\n"
+" -d=? ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្ននáŸáž™â€‹\n"
+" --គ្មាន​-delink អនុញ្ញាážâ€‹ delinking របៀប​បំបាážáŸ‹â€‹áž€áŸ†áž áž»ážŸâ€‹\n"
+" --មាážáž·áž€áž¶ áž–áž·áž“áž·ážáŸ’យ​ការបង្កើážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž˜áž¶ážáž·áž€áž¶\n"
+" -c=? អាន​ឯកសារ​ការកំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​នáŸáŸ‡â€‹\n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ការ​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ážáž¶áž˜â€‹áž…áž·ážáŸ’áž"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាážáŸ‹áž”ងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
+
+#: ftparchive/cachedb.cc:45
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB បាន​ážáž¼áž…​, ឯកសារ​បាន​ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ​ទៅ​ជា​ %s.old ។"
+
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
+
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទ០%s: %s"
+
+#: ftparchive/cachedb.cc:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "កាលបរិច្ឆáŸáž‘​​ឯកសារ​ážáŸ’រូវ​បាន​ប្ážáž¼ážšâ€‹ %s"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "áž”áŸážŽáŸ’ណសារ​គ្មាន​កំណážáŸ‹â€‹ážáŸ’រា​ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’យ​ទáŸâ€‹"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "មិន​អាច​យក​ទស្សនáŸáž‘្រនិច​"
+
+#: ftparchive/writer.cc:78
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: មិន​អាច​អាន​ážáž %s បាន​ឡើយ\n"
+
+#: ftparchive/writer.cc:83
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W ៖ មិន​អាច​ážáŸ’លែង %s\n"
+
+#: ftparchive/writer.cc:125
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:127
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:134
+msgid "E: Errors apply to file "
+msgstr "E: កំហុស​អនុវážáŸ’ážâ€‹áž›áž¾â€‹áž¯áž€ážŸáž¶ážšâ€‹"
+
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ដោះស្រាយ %s"
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "មែក​ធាង បាន​បរាជáŸáž™"
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បើក %s"
+
+#: ftparchive/writer.cc:245
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​អាន​ážáŸ†ážŽâ€‹ %s"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ផ្ដាច់ %s"
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ážâ€‹ %s ទៅ %s"
+
+#: ftparchive/writer.cc:274
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink កំណážáŸ‹â€‹áž“ៃ​ការ​វាយ %sB ។\n"
+
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
+#, c-format
+msgid "Failed to stat %s"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការážáŸ’លែង %s"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "áž”áŸážŽáŸ’ណសារ​គ្មាន​វាល​កញ្ចប់​"
+
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s គ្មាន​ធាážáž»áž’ាážáž»áž”ញ្ចូល​​បដិសáŸáž’ឡើយ\n"
+
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " អ្នក​ážáŸ‚ទាំ %s គឺ %s មិនមែន​ %s\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "កំហុស​ážáž¶áž„ក្នុង ​មិន​អាច​កំណážáŸ‹â€‹áž‘ីážáž¶áŸ†áž„​សមាជិក​ %s បានឡើយ"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​​បម្រុង​​ទុក​សážáž·â€‹"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "មិន​អាចបើក​ %s បានឡើយ"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Malformed បដិសáŸáž’ %s បន្ទាážáŸ‹ %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Malformed បដិសáŸáž’ %s បន្ទាážáŸ‹â€‹ %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Malformed បដិសáŸáž’ %s បន្ទាážáŸ‹â€‹ %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​អានឯកសារ​បដិសáŸáž’ %s"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ážáŸ’រូវ​ការ​កំណážáŸ‹â€‹áž€áž¶ážšáž”ង្ហាប់​"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹áž”ំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹ FILE*"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុងការ​ដាក់ជា​ពីរផ្នែក​"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "បង្ហាប់កូន"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "កំហុស​ážáž¶áž„ក្នុង​ បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹ %s"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹ážšáž„​ IPC"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ប្រážáž·áž”ážáŸ’ážáž·â€‹áž€áž˜áŸ’មវិធី​បង្ហាប់ "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "កម្មវិធី​ពន្លា"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជáŸáž™â€‹"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការអាន​ នៅពáŸáž›â€‹áž‚ណនា MD5"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់ážáŸ†ážŽ %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ %s ទៅ %s"
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex កំហុស​ការចងក្រង​ - %s"
+
+#: cmdline/apt-get.cc:237
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​មាន​ភាពអាស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž»ážŸâ€‹áž‚្នា ៖"
+
+#: cmdline/apt-get.cc:327
+#, c-format
+msgid "but %s is installed"
+msgstr "ប៉ុន្ážáŸ‚​ %s ážáŸ’រូវ​បាន​ដំឡើង​"
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ប៉ុន្ážáŸ‚​ %s នឹង​ážáŸ’រូវ​បាន​ដំឡើ​ង"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "ប៉ុន្ážáŸ‚​​វា​មិន​អាច​ដំឡើង​បាន​ទáŸâ€‹"
+
+#: cmdline/apt-get.cc:338
+msgid "but it is a virtual package"
+msgstr "ប៉ុន្ážáŸ‚​​វា​ជា​កញ្ចប់​និម្មិážâ€‹"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not installed"
+msgstr "ប៉ុន្ážáŸ‚​វា​មិន​បាន​ដំឡើង​ទáŸâ€‹"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "ប៉ុន្ážáŸ‚ វា​នឹង​មិន​ážáŸ’រូវ​បាន​ដំឡើង​ទáŸ"
+
+#: cmdline/apt-get.cc:346
+msgid " or"
+msgstr " ឬ"
+
+#: cmdline/apt-get.cc:375
+msgid "The following NEW packages will be installed:"
+msgstr "កញ្ចប់​ážáŸ’មី​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​ដំឡើង​ ៖"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹងážáŸ’រូវ​បាន​យកចáŸáž‰Â áŸ–"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "​កញ្ចប់​ážáž¶áž„​ក្រោម​ážáŸ’រូវ​បាន​យក​ážáŸ’រឡប់​មក​វិញ ៖"
+
+#: cmdline/apt-get.cc:444
+msgid "The following packages will be upgraded:"
+msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹង​​ážáŸ’រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
+
+#: cmdline/apt-get.cc:465
+msgid "The following packages will be DOWNGRADED:"
+msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹង​​ážáŸ’រូវ​បាន​បន្ទាប ៖"
+
+#: cmdline/apt-get.cc:485
+msgid "The following held packages will be changed:"
+msgstr "កញ្ចប់​រង់ចាំ​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​​បានផ្លាស់​​ប្ážáž¼ážšâ€‹Â áŸ–"
+
+#: cmdline/apt-get.cc:538
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ដោយ​សារážáŸ‚​ %s) "
+
+#: cmdline/apt-get.cc:546
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​យកចáŸáž‰Â áŸ”\n"
+"ការយកចáŸáž‰â€‹áž“áŸáŸ‡â€‹áž˜áž·áž“​ážáŸ’រូវ​បានធ្វើ​ទáŸâ€‹áž›áž»áŸ‡ážáŸ’រា​ážáŸ‚​អ្នកដឹង​ážáž¶â€‹â€‹áž¢áŸ’នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
+
+#: cmdline/apt-get.cc:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu ážáŸ’រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ážáŸ’រូវ​បានដំឡើង​ážáŸ’មី "
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ážáŸ’រូវ​បាន​ដំឡើង​ឡើង​វិញ "
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu ​ážáŸ’រូវបានបន្ទាប់ "
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu ដែលážáŸ’រូវ​យក​ចáŸáž‰â€‹ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចáŸáž‰áž”ានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រáŸáž™â€‹..."
+
+#: cmdline/apt-get.cc:652
+msgid " failed."
+msgstr " បាន​បរាជáŸáž™Â áŸ”"
+
+#: cmdline/apt-get.cc:655
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រáŸáž™â€‹áž”ានឡើយ​"
+
+#: cmdline/apt-get.cc:658
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណážáŸ‹â€‹áž—ាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: cmdline/apt-get.cc:660
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: cmdline/apt-get.cc:664
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រážáŸ‹ `apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនáŸáŸ‡â€‹áž áž¾áž™Â áŸ”"
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr "ភាព​អាស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž»ážŸâ€‹áž‚្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
+
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាážáŸ‹áž—ាពážáŸ’រឹមážáŸ’រូវកញ្ចប់ážáž¶áž„ក្រោមបានឡើយ !"
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "បានបដិសáŸáž’​ការព្រមាន​ការផ្ទៀងផ្ទាážáŸ‹áž—ាព​ážáŸ’រឹមážáŸ’រូវ ។\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "ដំឡើង​កញ្ចប់​ទាំងនáŸáŸ‡ ​ដោយគ្មានការពិនិážáŸ’យ​បញ្ជាក់ [y/N] ? "
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "មិនអាច​ផ្ទៀងផ្ទាážáŸ‹áž—ាពážáŸ’រឹមážáŸ’រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "មាន​បញ្ហា​ ហើយ -y ážáŸ’រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "កំហុស​ážáž¶áž„ក្នុង កញ្ចប់​ដំឡើង​ážáŸ’រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ážáž¼áž… !"
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."
+msgstr "កញ្ចប់ ​ážáŸ’រូវការឲ្យ​យក​ចáŸáž‰â€‹â€‹ ប៉ុន្ážáŸ‚មិនអនុញ្ញាážâ€‹áž²áŸ’យយកចáŸáž‰áž¡áž¾áž™Â áŸ”"
+
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "កំហុស​ážáž¶áž„ក្នុង​ ការ​រៀប​ážáž¶áž˜â€‹áž›áŸ†ážŠáž¶áž”់​មិន​បាន​បញ្ចប់ឡើយ"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+msgid "Unable to lock the download directory"
+msgstr "មិន​អាច​ចាក់​សោ​ážážâ€‹áž‘ាញ​យក​បាន​ឡើយ"
+
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
+
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "យី អី​កáŸâ€‹áž…ម្លែង​ម្លáŸáŸ‡.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "ážáŸ’រូវការ​​យក​ %sB/%sB នៃ​បáŸážŽáŸ’ណសារ ។​\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ážáŸ’រូវ​ការយក​ %sB នៃ​បáŸážŽáŸ’ណសារ ។\n"
+
+#: cmdline/apt-get.cc:829
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ážáŸ‚ម​​ទំហំ​ážáž¶ážŸâ€‹ážáŸ’រូវ​បាន​ប្រើ ។\n"
+
+#: cmdline/apt-get.cc:832
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ážáž¶ážŸáž“ឹង​​ទំនáŸážšÂ áŸ” \n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "មិន​អាច​កំណážáŸ‹â€‹áž‘ំហំ​ទំនáŸážšâ€‹áž€áŸ’នុង​ %s បានឡើយ"
+
+#: cmdline/apt-get.cc:849
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនáŸážšâ€‹áž‚្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "បានបញ្ជាក់​ážáŸ‚ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšážŠáŸ‚លមិនសំážáž¶áž“់ប៉ុណ្ណោះ ប៉ុន្ážáŸ‚​នáŸáŸ‡áž˜áž·áž“មែនជាប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšáž˜áž·áž“សំážáž¶áž“់នោះទáŸÂ áŸ”"
+
+#: cmdline/apt-get.cc:866
+msgid "Yes, do as I say!"
+msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ážáŸ’ញុំ​និយាយ !"
+
+#: cmdline/apt-get.cc:868
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"អ្នកប្រហែល​ជា​ធ្វើ​អ្វីមួយ​ដែល​អាច​បង្ករ​ឲ្យ​មាន​មហន្ដរាយ ។\n"
+"ដើម្បី​បន្ហ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
+" ?] "
+
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+msgid "Abort."
+msgstr "បោះបង់ ។"
+
+#: cmdline/apt-get.cc:889
+msgid "Do you want to continue [Y/n]? "
+msgstr "ážáž¾â€‹áž¢áŸ’នក​ចង់​បន្ážáž¬â€‹ [បាទ ចាស/áž‘áŸâ€‹] ? "
+
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទាញ​យក​"
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+msgid "Download complete and in download only mode"
+msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​ážáŸ‚​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"អនុញ្ញាážâ€‹áž²áŸ’យ​ទៅ​ប្រមូល​យក​បáŸážŽáŸ’ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រážáŸ‹â€‹áž—ាព​ទាន់​សមáŸáž™ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
+"fix- ដែលបាážáŸ‹áž¬áŸ‹Â ?"
+
+#: cmdline/apt-get.cc:990
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix- ដែលបាážáŸ‹â€‹ áž“áž·áž„ ​ស្វប​មáŸážŒáŸ€â€‹ážŠáŸ‚ល​មិនបាន​​គាំទ្រនៅពáŸáž›â€‹áž”ច្ចុប្បន្ន​"
+
+#: cmdline/apt-get.cc:995
+msgid "Unable to correct missing packages."
+msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាážáŸ‹áž”ង់​បានឡើយ ។"
+
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
+#: cmdline/apt-get.cc:1030
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+
+#: cmdline/apt-get.cc:1040
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណážáŸ‹â€‹â€‹Â áŸ”\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s áž‘áŸâ€‹ ដូច្នáŸáŸ‡ មិន​បាន​យកចáŸáž‰áž¡áž¾áž™ \n"
+
+#: cmdline/apt-get.cc:1069
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិážâ€‹ážŠáŸ‚ល​បាន​ផ្ážáž›áŸ‹â€‹ážŠáŸ„យ​ ៖\n"
+
+#: cmdline/apt-get.cc:1081
+msgid " [Installed]"
+msgstr " [បានដំឡើង​]"
+
+#: cmdline/apt-get.cc:1086
+msgid "You should explicitly select one to install."
+msgstr "អ្នក​គួរážáŸ‚​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
+
+#: cmdline/apt-get.cc:1091
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"មិន​មាន​កញ្ចប់​ %s ទ០ប៉ុន្ážáŸ‚​វា​ážáŸ’រូវ​បាន​យោង​ទៅ​ដោយ​កញ្ចប់​ផ្សáŸáž„​ទៀážâ€‹Â áŸ”\n"
+"វា​មាននáŸáž™â€‹ážáž¶â€‹áž”ាážáŸ‹áž€áž‰áŸ’ចប់ ​គáŸâ€‹áž›áŸ‚ង​ប្រើ ឬ\n"
+"អាច​រក​បាន​ពី​ប្រភព​ផ្សáŸáž„​ទៀáž\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "ទោះ​យ៉ាងណា​កáŸážŠáŸ„áž™ កញ្ចប់​ážáž¶áž„ក្រោម​ជំនួស​វា ៖"
+
+#: cmdline/apt-get.cc:1113
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
+
+#: cmdline/apt-get.cc:1133
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទ០វា​មិនអាចážáŸ’រូវបាន​ទាញយកបានឡើយ ។\n"
+
+#: cmdline/apt-get.cc:1141
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ជាកំណែ​ដែលážáŸ’មីបំផុážážšáž½áž…ទៅហើយ ។\n"
+
+#: cmdline/apt-get.cc:1168
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​ការ​ចáŸáž‰â€‹áž•áŸ’សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
+
+#: cmdline/apt-get.cc:1170
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
+
+#: cmdline/apt-get.cc:1176
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+
+#: cmdline/apt-get.cc:1313
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សមáŸáž™â€‹áž‚្មាន​អាគុយម៉ង់​ទáŸ"
+
+#: cmdline/apt-get.cc:1326
+msgid "Unable to lock the list directory"
+msgstr "មិន​អាច​ចាក់​សោ​ážážâ€‹áž”ញ្ជីបានឡើយ"
+
+#: cmdline/apt-get.cc:1384
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​​ទាញ​យក ​ពួកវាážáŸ’រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
+
+#: cmdline/apt-get.cc:1403
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "កំហុស​ážáž¶áž„ក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណáŸâ€‹ážáž¼áž…"
+
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទáŸ"
+
+#: cmdline/apt-get.cc:1516
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
+
+#: cmdline/apt-get.cc:1546
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "អ្នក​ប្រហែល​ជា​ចង់​រážáŸ‹ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នáŸáŸ‡Â áŸ–"
+
+#: cmdline/apt-get.cc:1549
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"ភាពអស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž»ážŸâ€‹áž‚្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
+
+#: cmdline/apt-get.cc:1561
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"មិនអាច​ដំឡើងកញ្ចប់​មួយចំនួន​បានឡើយ ។ áž“áŸáŸ‡â€‹áž˜áž¶áž“​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​\n"
+"​បានស្នើរ​ស្ážáž¶áž“ភាព​ដែល​មិន​អាច​ធ្វើបានមួយ ឬ ​ប្រសិន​បើ​​អ្នក​កំពុង​ប្រើការចែកចាយ​ពុំ​មាន​លំនឹង​នោះ កញ្ចប់​"
+"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើážâ€‹áž¡áž¾áž™â€‹\n"
+" ឬ ​បានយក​ចáŸáž‰â€‹áž–ីការមកដល់ ។"
+
+#: cmdline/apt-get.cc:1569
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"ចាប់​ážáž¶áŸ†áž„​ពី​អ្នក​បាន​ស្នើរ​ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹ážáŸ‚មួយមក​ វាទំនង​ហាក់​ដូចជា​\n"
+"កញ្ចប់ដែលមិនអាចដំឡើងបានដោយងាយ ហើយនិង​ការប្រឆាំងនឹង​របាយការណáŸâ€‹áž€áŸ†áž áž»ážŸ\n"
+"កញ្ចប់​នោះ​ គួរážáŸ‚ážáŸ’រូវបានបរាជáŸáž™Â áŸ”"
+
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“​ដូចážáž‘ៅនáŸáŸ‡ អាចជួយ​ដោះស្រាយ​ស្ážáž¶áž“ភាព​បាន ៖"
+
+#: cmdline/apt-get.cc:1577
+msgid "Broken packages"
+msgstr "កញ្ចប់​ដែល​បាន​ážáž¼áž…​"
+
+#: cmdline/apt-get.cc:1603
+msgid "The following extra packages will be installed:"
+msgstr "កញ្ចប់​បន្ážáŸ‚ម​ដូចážáž‘ៅនáŸáŸ‡ នឹងážáŸ’រូវបាន​ដំឡើង ៖"
+
+#: cmdline/apt-get.cc:1674
+msgid "Suggested packages:"
+msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
+
+#: cmdline/apt-get.cc:1675
+msgid "Recommended packages:"
+msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសនáŸÂ áŸ–"
+
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "
+msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
+
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "បាន​បរាជáŸáž™"
+
+#: cmdline/apt-get.cc:1703
+msgid "Done"
+msgstr "ធ្វើរួច​"
+
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "កំហុស​ážáž¶áž„ក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យážáž¼áž…​ឧបករណáŸ"
+
+#: cmdline/apt-get.cc:1876
+msgid "Must specify at least one package to fetch source for"
+msgstr "យ៉ាងហោចណាស់​ážáŸ’រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
+
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
+
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
+
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនáŸážšâ€‹áž‚្រប់គ្រាន់​ទáŸâ€‹áž“ៅក្នុង​ %s ឡើយ"
+
+#: cmdline/apt-get.cc:1979
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "ážáŸ’រូវការ​យក​ %sB/%sB នៃ​បáŸážŽáŸ’ណសារ​ប្រភព ។\n"
+
+#: cmdline/apt-get.cc:1982
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "ážáŸ’រូវការ​យក​ %sB នៃ​បáŸážŽáŸ’ណសារ​ប្រភព​ ។\n"
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
+
+#: cmdline/apt-get.cc:2019
+msgid "Failed to fetch some archives."
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការទៅប្រមូលយក​បáŸážŽáŸ’ណសារ​មួយចំនួន ។"
+
+#: cmdline/apt-get.cc:2047
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
+
+#: cmdline/apt-get.cc:2059
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជáŸáž™â€‹Â áŸ”\n"
+
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "áž–áž·áž“áž·ážáŸ’យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+
+#: cmdline/apt-get.cc:2077
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជáŸáž™â€‹Â áŸ”\n"
+
+#: cmdline/apt-get.cc:2096
+msgid "Child process failed"
+msgstr "ដំណើរ​ការ​កូន​បាន​បរាជáŸáž™â€‹"
+
+#: cmdline/apt-get.cc:2112
+msgid "Must specify at least one package to check builddeps for"
+msgstr "ážáŸ’រូវážáŸ‚​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិážáŸ’áž™ builddeps សម្រាប់"
+
+#: cmdline/apt-get.cc:2140
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "មិន​អាច​សាងសង់​​ពáŸážáŸŒáž˜áž¶áž“​ភាពអស្រáŸáž™â€‹ážŸáž˜áŸ’រាប់ %s"
+
+#: cmdline/apt-get.cc:2160
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s មិនមានភាពអាស្រáŸáž™â€‹ážŸáŸ’ážáž¶áž”នាឡើយ​ ។\n"
+
+#: cmdline/apt-get.cc:2212
+#, 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:2264
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"ភាពអាស្រáŸáž™ %s សម្រាប់ %s មិនអាច​ážáž˜áŸ’រូវចិážáŸ’ážáž”ានទ០ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​ážáž˜áŸ’រូវចិážáŸ’ážâ€‹"
+"ážáž˜áŸ’រូវការ​កំណែបានឡើយ"
+
+#: cmdline/apt-get.cc:2299
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ážáž˜áŸ’រូវចិážáŸ’ážáž—ាពអាស្រáŸáž™ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺážáŸ’មីពáŸáž€"
+
+#: cmdline/apt-get.cc:2324
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ážáž˜áŸ’រូវចិážáŸ’ážáž—ាពអាស្រáŸáž™ %s សម្រាប់ %s: %s"
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "ភាពអាស្រáŸáž™â€‹ážŠáŸ‚ល​បង្កើážâ€‹ %s មិន​អាច​បំពáŸáž‰â€‹ážŸáŸáž…ក្ដី​ážáŸ’រូវការ​បាន​ទáŸÂ áŸ”"
+
+#: cmdline/apt-get.cc:2342
+msgid "Failed to process build dependencies"
+msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ដំណើរ​​ការ​បង្កើážâ€‹áž—ាព​អាស្រáŸáž™"
+
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"
+msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
+
+#: cmdline/apt-get.cc:2415
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"របៀបប្រើ ៖ ពាក្យបញ្ជា apt-get [options]\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] ប្រភព pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get គឺជា​ចំណុចប្រទាក់​បន្ទាážáŸ‹â€‹áž–ាក្យបញ្ជា​សាមញ្ញ​មួយ សម្រាប់​ធ្វើការទាញយក áž“áž·áž„\n"
+"ដំឡើង​កញ្ចប់ ។ ជាញឹកញាប់​បំផុហគឺប្រើ​ពាក្យបញ្ជា​ដើម្បី​ធ្វើឲ្យទាន់សមáŸáž™â€‹\n"
+"និង ដំឡើង ។\n"
+"\n"
+"ពាក្យ​បញ្ជា ៖\n"
+" update - ទៅយក​បញ្ជី​កញ្ចប់​ážáŸ’មី\n"
+" upgrade - ធ្វើឲ្យប្រសើរ\n"
+" install - ដំឡើង​កញ្ចប់​ážáŸ’មី (pkg គឺ libc6 មិនមែន libc6.deb)\n"
+" remove - យក​កញ្ចប់​ចáŸáž‰\n"
+" source - ទាញយក​បáŸážŽáŸ’ណសារ​ប្រភព\n"
+" build-dep - កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ភាពអាស្រáŸáž™â€‹áž€áŸ’នុងការស្ážáž¶áž”នា​សម្រាប់​កញ្ចប់​ប្រភព\n"
+" dist-upgrade - ការចែកចាយ​ភាពល្អប្រសើរ សូមមើល apt-get(8)\n"
+" dselect-upgrade - ដាក់ពីក្រោយ​ជម្រើស dselect\n"
+" clean - លុប​ឯកសារបáŸážŽáŸ’ណសារ​ដែលបានទាញ​យក\n"
+" autoclean - លុប​ឯកសារបáŸážŽáŸ’ណសារ​ដែលបានទាញយក​ចាស់\n"
+" check - ផ្ទៀងផ្ទាážáŸ‹â€‹ážáž¶â€‹áž˜áž·áž“មានភាព​អាស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž¼áž…áž‘áŸ\n"
+"\n"
+"ជម្រើស ៖\n"
+" -h អážáŸ’ážáž”ទ​ជំនួយ​នáŸáŸ‡Â áŸ–\n"
+" -q ទិន្នផល​ដែល​អាច​ចុះកំណážáŸ‹áž áŸážáž»áž”ាន - មិនមាន​ទ្រនិចបង្ហាញ​ដំណើរការឡើយ\n"
+" -qq គ្មាន​លទ្ធផល​ទ០លើកលែងážáŸ‚​កំហុស\n"
+" -d ទាញយកážáŸ‚ប៉ុណ្ណោះ - កុំដំឡើង​ ឬ ស្រាយ​បáŸážŽáŸ’ណសារ\n"
+" -s No-act. ធ្វើការ​ក្លែង​ការរៀប​ážáž¶áž˜áž›áŸ†ážŠáž¶áž”់\n"
+" -y សន្មážâ€‹ážáž¶ បាទ/ចាស ទៅគ្រប់ážáž˜áŸ’រូវការ ហើយកុំ​រំលឹក\n"
+" -f ប៉ុនប៉ង​ធ្វើការបន្ážâ€‹ ប្រសិនបើ​ការពិនិážáŸ’យ​ភាពážáŸ’រឹមážáŸ’រូវ​បរាជáŸáž™\n"
+" -m ប៉ុនប៉ង​ធ្វើការបន្ážâ€‹ ប្រសិនបើ​បáŸážŽáŸ’ណសារ​មិនអាច​ដាក់ទីážáž¶áŸ†áž„បាន\n"
+" -u បង្ហាញ​បញ្ជី​កញ្ចប់​ដែល​បានធ្វើឲ្យប្រសើរ​ផងដែរ\n"
+" -b ស្ážáž¶áž”នា​កញ្ចប់ប្រភព បន្ទាប់ពី​ទៅប្រមូលយកវា\n"
+" -V បង្ហាញ​លáŸážáž€áŸ†ážŽáŸ‚​ជា​អក្សរ\n"
+" -c=? អាន​ឯកសារកំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​នáŸáŸ‡\n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ​ážáž¶áž˜áž…áž·ážáŸ’ážâ€‹áž˜áž½áž™ ឧទ. -o dir::cache=/tmp\n"
+"សូមមើល apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "វាយ​"
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "យក​ ៖"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Ign "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Err "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [កំពុង​ធ្វើការ​]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"ផ្លាស់ប្ážáž¼ážšâ€‹áž˜áŸážŒáŸ€Â áŸ– សូម​បញ្ចូល​ážáž¶ážŸâ€‹ážŠáŸ‚ល​មាន​ស្លាក\n"
+" '%s'\n"
+"ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "មិន​ស្គាល់​កំណážáŸ‹â€‹ážáŸ’រា​កញ្ចប់ !"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs ជា​ឧបករណáŸâ€‹áž’ម្មážáž¶â€‹ážŠáž¾áž˜áŸ’បី​ážáž˜áŸ’រៀប​ឯកសារ​កញ្ចប់ ។ ជម្រើស​ -s បាន​ប្រើ​\n"
+"សម្រាប់​ចង្អុល​ប្រភáŸáž‘​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
+"\n"
+"ជម្រើស​\n"
+" -h អážáŸ’ážáž”ទ​ជំនួយ​នáŸáŸ‡â€‹\n"
+" -s ប្រើ​ការ​ážáž˜áŸ’រៀប​ឯកសារ​ប្រភព\n"
+" -c=? អាន​ឯកសារ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធនáŸáŸ‡â€‹\n"
+" -o=? កំណážáŸ‹â€‹áž‡áž˜áŸ’រើស​ការ​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ​ážáž¶áž˜â€‹áž…áž·ážáŸ’ហឧ. -o dir::cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "ការ​កំណážáŸ‹â€‹áž›áŸ†áž“ាំ​ដើម​មិន​ល្អ !"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "សង្កážáŸ‹â€‹ បញ្ចូល ​ដើម្បី​បន្ážÂ áŸ”"
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "កំហុ​ស​មួយ​ចំនួន​បាន​កើážâ€‹áž¡áž¾áž„​ážážŽáŸˆáž–áŸáž›â€‹áž–ន្លា​កញ្ចប់ ។ ážáŸ’ញុំ​នឹង​កំណážáŸ‹ážšáž…នាសម្បáŸáž“្ធ"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "កញ្ចប់​ដែល​បាន​ដំឡើង​ ។ áž“áŸáŸ‡â€‹áž”្រហែល​ជា​លទ្ធផល​កំហុស​ស្ទួន​"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាážáŸ‹áž”ង់​ភាពអាស្រáŸáž™â€‹Â áŸ” ​មិន​អី​ទáŸâ€‹ គ្រាន់​ážáŸ‚​ជា​កំហុស "
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr "នៅážáž¶áž„លើ​សារ​នáŸáŸ‡â€‹áž‚ឺ​សំážáž¶áž“់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រážáŸ‹â€‹áž€áž¶ážšážŠáŸ†áž¡áž¾áž„​ម្ážáž„ទៀážâ€‹"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "បញ្ចូល​​ពáŸážáŸŒáž˜áž¶áž“​ដែលមាន​ចូល​គ្នា"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "បាន​បរាជáŸáž™áž€áŸ’នុង​ការ​បង្កើážâ€‹áž”ំពង់​"
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "បាន​បរាជáŸáž™áž€áŸ’នុង​ការ​ប្រážáž·áž”ážáŸ’ážáž· gzip"
+
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+msgid "Corrupted archive"
+msgstr "áž”áŸážŽáŸ’ណសារ​បាន​ážáž¼áž…​"
+
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar ឆáŸáž€ážŸáž¶áŸ†â€‹áž”ាន​បរាជáŸáž™ áž”áŸážŽáŸ’ណសារ​បាន​ážáž¼áž…"
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "មិន​ស្គាល់​ប្រភáŸáž‘​បឋមកážáž¶â€‹ TAR %u ដែលជា​សមាជិក​ %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹áž”áŸážŽáŸ’ណសា​រមិន​ážáŸ’រឹមážáŸ’រូវ​"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "កំហុស​ក្នុងការ​អានបឋមកážáž¶â€‹ážŸáž˜áž¶áž‡áž·áž€â€‹áž”áŸážŽáŸ’ណសារ"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "បឋមកážáž¶â€‹ážŸáž˜áž¶áž‡áž·áž€â€‹áž”áŸážŽáŸ’ណសារ"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "áž”áŸážŽáŸ’ណសារ ážáŸ’លីពáŸáž€"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​អាន​បឋមកážáž¶â€‹áž”áŸážŽáŸ’ណសារ"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "ទម្លាក់​ážáŸ’នាំង​ដែល​បាន​ហៅ​លើ​ážáŸ’នាំងដែល​នៅážáŸ‚ážáž—្ជាប់"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ដាក់ទីážáž¶áŸ†áž„​ធាážáž»â€‹ážŠáŸ‚លរាយប៉ាយ !"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​បម្រុងទុក​ការបង្វែរ"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "កំហុស​ážáž¶áž„ក្នុង នៅក្នុង AddDiversion"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "កំពុង​ព្យាយាម​សរសáŸážšâ€‹áž‡áž¶áž“់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "ការបន្ážáŸ‚ម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "ឯកសារ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ស្ទួន​ %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​សរសáŸážšâ€‹áž¯áž€ážŸáž¶ážš %s"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​បិទឯកសារ %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "ផ្លូវ​ %s វែង​ពáŸáž€"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្ážáž„​"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "ážážâ€‹ %s ážáŸ’រូវបាន​បង្វែរ"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសáŸážšâ€‹áž‘ៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "ផ្លូវ​បង្វែរ វែងពáŸáž€"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ážážâ€‹ %s ážáŸ’រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ážážâ€‹"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ដាក់ážáŸ’នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "ផ្លូវ​វែង​ពáŸáž€"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "សរសáŸážšâ€‹áž‡áž¶áž“់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "ឯកសារ​ %s/%s សរសáŸážšáž‡áž¶áž“់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "មិន​អាច​អាន​ %s បានឡើយ"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "មិន​អាច​ážáŸ’លែង %s បានឡើយ"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "បរាជáŸáž™áž€áŸ’នុងការយក %s áž…áŸáž‰"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "មិន​អាច​បង្កើážâ€‹ %s បានឡើយ"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការážáŸ’លែង %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "ážážáž–áŸážáŸŒáž˜áž¶áž“​ áž“áž·áž„ ពុម្ព ážáŸ’រូវការនៅលើ​ប្រពáŸáž“្ធឯកសារ​ដូចគ្នា​"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ផ្លាស់ប្ដូរទៅជា​ážážáž¢áŸ’នកគ្រប់គ្រង %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "កំហុស​ក្នុង​ការ ក្នុងការ​ទទួល​យក​ឈ្មោះកញ្ចប់"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"បរាជáŸáž™â€‹áž€áŸ’នុងការ​បើក​ឯកសារ​បញ្ជី​ '%sinfo/%s' ។ ប្រសិនបើ​អ្នក​មិន​អាច​ស្ážáž¶ážšâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž“áŸáŸ‡áž”ានទ០បន្ទាប់​មក​"
+"ធ្វើឲ្យវា​ទទ០ហើយ​ដំឡើង​កញ្ចប់ដែលកំណែ​ដូចគ្នា​ឡើងវិញភ្លាមៗ !"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​អាន​ឯកសារបញ្ជី​ %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "កំហុស​ážáž¶áž„ក្នុង ក្នុង​​ការ​ទទួល​យក​ážáŸ’នាំង​"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​បើក​ឯកសារបង្វែរ​ %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "ឯកសារ​បង្វែរ​បានážáž¼áž…"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "បន្ទាážáŸ‹â€‹ážŠáŸ‚លមិនážáŸ’រឹមážáŸ’រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "កំហុស​ážáž¶áž„ក្នុង​ ក្នុង​ការបន្ážáŸ‚ម​ការបង្វែរ​"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "ឃ្លាំងសម្ងាážáŸ‹ pkg ážáŸ’រូវ​ážáŸ‚​ចាប់ផ្ážáž¾áž˜â€‹ážŠáŸ†áž¡áž¾áž„មុន"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការរកកញ្ចប់ ៖ បឋមកážáž¶â€‹ អុហ្វសិហ%lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "ផ្នែក​ ConfFile ážáž¼áž… នៅក្នុង​ឯកសារ​ស្ážáž¶áž“ភាព ។ អុហ្វសិážâ€‹ %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "កំហុស​ក្នុងការញែក​ MD5 ។ អុហ្វសិážâ€‹ %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "áž“áŸáŸ‡â€‹áž‡áž¶áž˜áž·áž“មែនជា​បáŸážŽáŸ’ណសារ​ DEB ​ážáŸ’រឹមážáŸ’រូវទ០បាážáŸ‹áž”ង់សមាជិក​ '%s'​"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "áž“áŸáŸ‡áž‡áž¶â€‹áž”áŸážŽáŸ’ណសារ DEB មិន​ážáŸ’រឹមážáŸ’រូវ វាគ្មានសមាជិក '%s' ឬ '%s'"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "មិនអាច​ប្ដូរ​ទៅជា​ %s បានឡើយ"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "កំហុស​ážáž¶áž„ក្នុង មិន​អាចដាក់ទីážáž¶áŸ†áž„​ឲ្យ​សមាជិក​បានឡើយ"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការដាក់ទិážáž¶áŸ†áž„​ឯកសារ​ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’យ​ដែលážáŸ’រឹមážáŸ’រូវ​"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "ឯកសារážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’យ​ដែលមិនអាច​ញែកបាន"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "មិន​អាច​អាន​មូលដ្ឋាន​ទិន្ននáŸáž™â€‹â€‹ážŸáŸŠáž¸ážŒáž¸ážšáŸ‰áž¼áž˜â€‹â€‹ %s បានឡើយ"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"សូម​ប្រើ​ apt-cdrom ដើម្បី​បង្កើážâ€‹ážŸáŸŠáž¸ážŒáž¸-រ៉ូម​នáŸáŸ‡â€‹ ដែលបានរៀបចំ​ážáž¶áž˜â€‹ APT​ ។ apt-get ធ្វើ​ឲ្យ​ទាន់សមáŸáž™ ​មិន​"
+"ážáŸ’រូវ​បានប្រើ​ដើម្បី​បន្ážáŸ‚ម​ស៊ីឌី-រ៉ូមážáŸ’មីឡើយ​"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "ស៊ីឌី-រ៉ូមážáž»ážŸ"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូម​ នៅ​​ក្នុង​ %s បានទ០វាអាចនៅážáŸ‚ប្រើបាន ។"
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "រក​ážáž¶ážŸáž˜áž·â€‹áž“​ឃើញ​ ។"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "រកឯកសារ​មិន​ឃើញ​"
+
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការážáŸ’លែង"
+
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "បរាជáŸáž™áž€áŸ’នុងការកំណážáŸ‹â€‹áž–áŸáž›ážœáŸáž›áž¶â€‹áž€áž¶ážšáž€áŸ‚ប្រែ​"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI មិនážáŸ’រឹមážáŸ’រូវ​ URIS មូលដ្ឋានមិនážáŸ’រូវ​ចាប់ផ្ážáž¾áž˜â€‹áž‡áž¶áž˜áž½áž™â€‹ // ឡើយ"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "កំពុង​ចូល​"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "មិន​អាច​កំណážáŸ‹ážˆáŸ’មោះដែលážáŸ’រូវបង្ហាញ​បានឡើយ​"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "មិន​អាច​កំណážáŸ‹ážˆáŸ’មោះមូលដ្ឋាន​បានឡើយ"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "ម៉ាស៊ីន​បម្រើបានបដិសáŸáž’​ការážáž—្ជាប់ ហើយ​ បាននិយាយ ៖ %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER បរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS បានបរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ážáŸ’រូវ​បាន​បញ្ជាក់​ ប៉ុន្ážáŸ‚​គ្មាន​ស្គ្រីប​ចូល​ទ០Acquire::ftp::ProxyLogin គឺ áž‘áž‘áŸÂ áŸ”"
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជáŸáž™ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE បានបរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "អស់ពáŸáž›â€‹áž€áŸ’នុងការážáž—្ជាប់​"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការážáž—្ជាប់​"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "ការអាន​មានកំហុស"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "ឆ្លើយážáž”​សážáž·â€‹áž”ណ្ážáŸ„ះអាសន្ន​​អស់ចំណុះ ។"
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "ការបង្ážáž¼áž…​ពិធីការ​"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "ការសរសáŸážšâ€‹áž˜áž¶áž“កំហុស"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "មិន​អាច​បង្កើážâ€‹ážšáž“្ធបានឡើយ"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "មិន​អាច​ážáž—្ជាប់​​រន្ធទិន្ននáŸáž™â€‹áž”ានឡើយ អស់​ពáŸáž›â€‹áž€áŸ’នុងការážáž—្ជាប់​"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "មិនអាចážáž—្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្ážáž¶áž”់​​បានឡើយ"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "មិន​អាច​កំណážáŸ‹â€‹ážˆáŸ’មោះរបស់​រន្ធ​បានឡើយ"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT បរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "ការážáž—្ជាប់​រន្ធ​​ទិន្ននáŸáž”ានអស់ពáŸáž›â€‹"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "មិនអាច​ទទួលយក​ការážáž—្ជាប់​បានឡើយ"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "បញ្ហា​ធ្វើឲ្យážáž¼áž…​ឯកសារ"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "រន្ធ​ទិន្ននáŸáž™â€‹áž”ាន​អស់​ពáŸáž›â€‹"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "បរាជáŸáž™áž€áŸ’នុងការ​ផ្ទáŸážšâ€‹áž‘ិន្ននáŸáž™ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "សំណួរ​"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "មិន​អាច​ហៅ​ "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "កំពុង​ážáž—្ជាប់​ទៅ​កាន់​ %s (%s)"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP ៖ %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "មិន​អាច​បង្កើážâ€‹ážšáž“្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "មិនអាច​ចាប់ផ្ដើម​ការážáž—្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "មិន​អាច​ážáž—្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​ážáž—្ជាប់​បានអស់​ពáŸáž›â€‹"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "មិន​អាច​ážáž—្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។"
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "កំពុង​ážáž—្ជាប់​ទៅកាន់ %s"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "ការ​ដោះស្រាយ​ភាព​បរាជáŸáž™â€‹â€‹áž”ណ្ážáŸ„ះអាសន្ន '%s'"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើážâ€‹áž¡áž¾áž„​ '%s:%s' (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "មិន​អាច​ážáž—្ជាប់​ទៅកាន់​​ %s %s ៖"
+
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ áž…áŸáž‰â€‹Â áŸ”"
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "កំហុស​ážáž¶áž„ក្នុង​ ៖ áž ážáŸ’ážáž›áŸážáž¶â€‹â€‹áž›áŸ’អ ប៉ុន្ážáŸ‚ ​មិន​អាច​កំណážáŸ‹â€‹áž€áž¼áž“សោ​ស្នាម​ម្រាមដៃ ?!"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "​បានជួប​ប្រទះ​​​​ហážáŸ’ážáž›áŸážáž¶â€‹áž™áŸ‰áž¶áž„ហោចណាស់មួយ ដែ​លážáŸ’រឹមážáŸ’រូវ​ ។"
+
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " ដើម្បី​ពិនិážáŸ’យ​ហážáŸ’ážáž›áŸážáž¶â€‹ ( gnupg បានដំឡើង​ឬអážáŸ‹Â ?)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "មិនស្គាល់កំហុស ក្នុងការប្រážáž·áž”ážáŸ’ážáž· gpgv"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹ážáž¶áž„​ក្រោម​មិន​ážáŸ’រឹមážáŸ’រូវ ៖\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹ážáž¶áž„ក្រោម​មិន​អាចផ្ទៀងផ្ទាážáŸ‹áž”ាន​ទáŸâ€‹ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "កំពុង​រង់ចាំ​បឋមកážáž¶"
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "យកបន្ទាážáŸ‹â€‹áž”ឋមកážáž¶â€‹ážáŸ‚មួយ​​ ដែលលើស %u ážáž½áž¢áž€áŸ’សរ"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "ជួរ​បឋមកážáž¶â€‹ážáž¼áž…​"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកážáž¶áž…ម្លើយážáž”មិនážáŸ’រឹមážáŸ’រូវ"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកážáž¶áž”្រវែង​​​មាážáž·áž€áž¶â€‹áž˜áž·áž“ážáŸ’រឹមážáŸ’រូវ​"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកážáž¶â€‹áž‡áž½ážšâ€‹áž˜áž¶ážáž·áž€áž¶â€‹áž˜áž·áž“​ážáŸ’រឹមážáŸ’រូវ​"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "ម៉ាស៊ីន​បម្រើ HTTP áž“áŸáŸ‡áž”ាន​ážáž¼áž…​​​ជួរ​គាំទ្រ​"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆáŸáž‘"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "ជ្រើស​បាន​បរាជáŸáž™â€‹"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "ការážáž—្ជាប់​បាន​អស់ពáŸáž›â€‹"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "កំហុស​ក្នុងការ​សរសáŸážšáž‘ៅកាន់​ឯកសារលទ្ធផល"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "កំហុស​ក្នុងការ​សរសáŸážšáž‘ៅកាន់​ឯកសារ"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "កំហុសក្នុងការ​សរសáŸážšâ€‹áž‘ៅកាន់​ឯកសារ"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការážáž—្ជាប់"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "ទិន្ននáŸáž™â€‹áž”ឋមកážáž¶â€‹ážáž¼áž…"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "ការážáž—្ជាប់​បាន​បរាជáŸáž™â€‹"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "កំហុស​ážáž¶áž„​ក្នុង​"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "មិនអាច mmap ឯកសារទទáŸâ€‹áž”ានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "មិន​អាច​បង្កើážâ€‹ mmap នៃ​ %lu បៃបានឡើយ"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភáŸáž‘​អក្សរ​សង្ážáŸáž” ៖ '%c'"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "កំពុង​បើ​ឯកសារ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ​ %s"
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "បន្ទាážáŸ‹â€‹ %d វែងពáŸáž€â€‹ (អážáž·áž”រមា %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្ážáž¾áž˜â€‹â€‹ážŠáŸ„យ​គ្មាន​ឈ្មោះ​ ។"
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ážáž˜áŸ’លៃ​ឥážáž”ានការ​នៅ​ក្រៅ​"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សáŸáž…ក្ដីបង្គាប់​អាចážáŸ’រូវបានធ្វើ​ážáŸ‚នៅលើ​កម្រិážâ€‹áž€áŸ†áž–ូល​ážáŸ‚ប៉ុណ្ណោះ"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនáŸáŸ‡â€‹"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សáŸáž…ក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥážáž”ានការ​បន្ážáŸ‚ម ដែលនៅážáž¶áž„ចុង​ឯកសារ"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... កំហុស ​!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... ធ្វើរួច​"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ជម្រើស​បន្ទាážáŸ‹â€‹áž–ាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាážáŸ‹â€‹áž–ាក្យ​បញ្ជា %s ឡើយ"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "ជម្រើស​បន្ទាážáŸ‹áž–ាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទáŸ"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "ជម្រើស​ %s ážáŸ’រូវការ​អាគុយម៉ង់មួយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាážáž»â€‹áž€áŸ†ážŽážáŸ‹ážšáž…នាសម្ពáŸáž“្ធážáŸ’រូវážáŸ‚មាន =<val> មួយ ។"
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ជម្រើស​ %s ážáŸ’រូវ​ការ​អាគុយម៉ង់​ចំនួន​គážáŸ‹â€‹ មិន​មែន​ '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "ជម្រើស​ '%s' វែងពáŸáž€"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ áž–áž·ážâ€‹ ​​​ឫ មិន​ពិážÂ áŸ”"
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹áž˜áž·áž“​ážáŸ’រឹមážáŸ’រូវ​ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "មិនអាច​ážáŸ’លែង ចំណុចម៉ោន %s បានឡើយ"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "បរាជáŸáž™áž€áŸ’នុងការ​ážáŸ’លែង ស៊ីឌីរ៉ូម"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់ážáŸ‚ឯកសារចាក់សោ​ដែលបានážáŸ‚អានប៉ុណ្ណោះ %s"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "រង់ចាំប់​ %s ប៉ុន្ážáŸ‚ ​វា​មិន​នៅទីនោះ"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "ដំណើរការ​រង​ %s បានážáŸ’រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "ដំណើរការ​រង​ %s បានចáŸáž‰ ដោយ​មិន​រំពឹង​ទុក​ "
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "អាន​, នៅážáŸ‚​មាន %lu ដើម្បី​អាន​ ប៉ុន្ážáŸ‚​គ្មាន​អ្វី​នៅសល់"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "សរសáŸážšâ€‹, នៅážáŸ‚មាន​ %lu ដើម្បី​សរសáŸážšâ€‹ ប៉ុន្ážáŸ‚​មិន​អាច​"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់ážáŸ†ážŽâ€‹áž¯áž€ážŸáž¶ážš"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "ឃ្លាំង​កញ្ចប់​ទទáŸâ€‹"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ážáŸ’រឹមážáŸ’រូវ​"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "ឯកសារ​ឃ្លាំងសម្ងាážáŸ‹â€‹â€‹áž€áž‰áŸ’ចប់​ជាកំណែ​មិន​ážáŸ’រូវគ្នា​"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "APT áž“áŸáŸ‡ មិនគាំទ្រ​ប្រពáŸáž“្ធ​ ការធ្វើកំណែនáŸáŸ‡áž‘áŸâ€‹ '%s'"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "ឃ្លាំង​សម្ងាážáŸ‹â€‹áž€áž‰áŸ’ចប់ážáŸ’រូវ​បានស្ážáž¶áž”នា់​សម្រាប់ស្ážáž¶áž”ážáŸ’យករ​ážáž»ážŸâ€‹áŸ—គ្នា​​"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "អាស្រáŸáž™â€‹"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "អាស្រáŸáž™áž‡áž¶â€‹áž˜áž»áž“"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "ផ្ដល់យោបល់​"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "ផ្ážáž›áŸ‹â€‹áž¢áž“ុសាសនáŸâ€‹"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "ប៉ះទង្គិច"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "ជំនួស​"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "លែង​ប្រើ"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "សំážáž¶áž“់​"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "បាន​ទាមទារ"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "គំរូ"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "ស្រáŸáž…áž…áž·ážáŸ’áž"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "បន្ážáŸ‚ម"
+
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+msgid "Building dependency tree"
+msgstr "កំពុងស្ážáž¶áž”នា​មែកធាងភាពអាស្រáŸáž™"
+
+#: apt-pkg/depcache.cc:62
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
+
+#: apt-pkg/depcache.cc:91
+msgid "Dependency generation"
+msgstr "ការបង្កើážâ€‹áž—ាពអាស្រáŸáž™â€‹"
+
+#: apt-pkg/tagfile.cc:72
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "បន្ទាážáŸ‹ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "បន្ទាážáŸ‹ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "បន្ទាážáŸ‹â€‹ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "បន្ទាážáŸ‹ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "បន្ទាážáŸ‹ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "កំពុង​បើក​ %s"
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "បន្ទាážáŸ‹â€‹ %u មាន​ប្រវែង​វែងពáŸáž€áž“ៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "បន្ទាážáŸ‹â€‹ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភáŸáž‘​)"
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ប្រភáŸáž‘​ '%s' មិន​ស្គាល់នៅលើបន្ទាážáŸ‹â€‹ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "បន្ទាážáŸ‹â€‹ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (áž›áŸážážŸáž˜áŸ’គាល់​ក្រុមហ៊ុន​លក់)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"ការរážáŸ‹â€‹áž€áž¶ážšážŠáŸ†áž¡áž¾áž„​នáŸáŸ‡ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/"
+"ភាពអាស្រáŸáž™áž‡áž¶áž˜áž»áž“ ។ ជាញឹកញាប់គឺ មិនážáŸ’រឹមážáŸ’រូវ ប៉ុន្ážáŸ‚ ប្រសិនបើអ្នក​ពិážáž‡áž¶áž…ង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
+"Force-LoopBreak សកម្ម ។"
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ប្រភáŸáž‘​ឯកសារ​លិបិក្រម​ '%s' មិនážáŸ’រូវ​បាន​គាំទ្រ​"
+
+#: apt-pkg/algorithms.cc:241
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "កញ្ចប់ %s ážáŸ’រូវការឲ្យដំឡើង ប៉ុន្ážáŸ‚​ ážáŸ’ញុំ​មិន​អាច​រក​បáŸážŽáŸ’ណសារ​សម្រាប់​វា​បាន​ទáŸâ€‹Â áŸ”"
+
+#: apt-pkg/algorithms.cc:1059
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើហនáŸáŸ‡â€‹áž”្រហែលជា បង្កដោយកញ្ចប់​"
+"ដែលបាន​ទុក ។"
+
+#: apt-pkg/algorithms.cc:1061
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "មិន​អាច​កែ​បញ្ហាបានទáŸáŸ អ្កបានទុក​កញ្ចប់​ដែល​ážáž¼áž… ។។"
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "រាយបញ្ជី​ážážâ€‹ %spartial គឺ​បាážáŸ‹áž”ង់​ ។"
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "ážážâ€‹áž”áŸážŽáŸ’ណសារ​ %spartial គឺ​បាážáŸ‹áž”ង់​ ។"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "កំពុងទាញយក​ឯកសារ​ %li នៃ %li (%s នៅ​សល់)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ"
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ážáŸ’ážš %s ឡើយ ។"
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ážáŸ’រ​ %s មិន​អាច​ចាប់​ផ្ážáž¾áž˜â€‹ážáŸ’រឹមážáŸ’រូវ​ទáŸâ€‹"
+
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កážáŸ‹â€‹áž…ូល ។"
+
+#: apt-pkg/init.cc:120
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "មិន​គាំទ្រ​ប្រពáŸáž“្ធ​កញ្ចប់'%s' ឡើយ"
+
+#: apt-pkg/init.cc:136
+msgid "Unable to determine a suitable packaging system type"
+msgstr "មិនអាច​កំណážáŸ‹â€‹áž”្រភáŸáž‘​ប្រពáŸáž“្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "មិនអាច​ážáŸ’លែង %s បានឡើយ ។"
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "អ្នកážáŸ’រូវážáŸ‚ដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ážáž¶áž“ភាព​មិន​អាចážáŸ’រូវបាន​​ញែក ​​ឬ ážáŸ’រូវបាន​បើកបានឡើយ​​ ។"
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សមáŸáž™ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនáŸáŸ‡"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "កំណážáŸ‹ážáŸ’រា​មិនážáŸ’រឹមážáŸ’រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិážáŸ’ហមិនមាន​បឋមកážáž¶â€‹áž€áž‰áŸ’ចប់ទáŸ"
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "មិន​បាន​យល់​ពី​ប្រភáŸáž‘​ម្ជុល %s ឡើយ"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទáŸ"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "ឃ្លាំងសម្ងាážáŸ‹â€‹áž˜áž·áž“​ážáŸ’រូវ​គ្នា​នឹង ប្រពáŸáž“្ធ ធ្វើកំណែ"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​​ ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (កញ្ចប់​ážáŸ’មី​)"
+
+#: apt-pkg/pkgcachegen.cc:129
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "កំហុស​បាន​កើážáž¡áž¾áž„​ ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)"
+
+#: apt-pkg/pkgcachegen.cc:150
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "កំហុស​បាន​កើážáž¡áž¾áž„​ ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)"
+
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "កំហុស​បានកើážáž¡áž¾áž„​ ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ážáŸ’មី​១)"
+
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "កំហុស​បានកើážâ€‹áž¡áž¾áž„​ ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (កំណែ១ážáŸ’មី​)"
+
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "កំហុស​បាន​កើážáž¡áž¾áž„​ ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)"
+
+#: apt-pkg/pkgcachegen.cc:192
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (កំណែ២​ážáŸ’មី​)"
+
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT áž“áŸáŸ‡â€‹áž†áž”គ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT áž“áŸáŸ‡â€‹áž†áž”គ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រáŸáž™â€‹áž›áž¾ážŸâ€‹áž…ំនួន​ APT áž“áŸáŸ‡â€‹áž†áž”គ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "កំហុស​បានកើážáž¡áž¾áž„​ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:254
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "កំហុស​បានកើážáž¡áž¾áž„​ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​%s (ផ្ážáž›áŸ‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž”្រមូល​ផ្ážáž»áŸ†)"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ដំណើរការ​ភាពអាស្រáŸáž™â€‹â€‹áž¯áž€ážŸáž¶ážš"
+
+#: apt-pkg/pkgcachegen.cc:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចážáŸ’លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាážáŸ‹â€‹áž”្រភព​"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ​បានបរាជáŸáž™â€‹, %s (%s -> %s) ។"
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ážáž¶áž„ក្រោម​នáŸáŸ‡áž‘áŸÂ áŸ–\n"
+
+#: apt-pkg/acquire-item.cc:753
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"ážáŸ’ញុំ​មិន​អាច​រកទីážáž¶áŸ†áž„​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទáŸÂ áŸ” ​មាន​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​ážáŸ’រូវការ​ជួសជុល​កញ្ចប់​នáŸáŸ‡â€‹ážŠáŸ„យ​ដៃ ។ "
+"(ដោយសារ​​បាážáŸ‹â€‹ážŸáŸ’ážáž¶áž”ážáŸ’យកម្ម)"
+
+#: apt-pkg/acquire-item.cc:812
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"ážáŸ’ញុំ​មិន​អាច​រកទីážáž¶áŸ†áž„​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទáŸÂ áŸ” ​មាន​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​ážáŸ’រូវការ​ជួសជុល​កញ្ចប់​នáŸáŸ‡â€‹ážŠáŸ„យ​ដៃ ។"
+
+#: apt-pkg/acquire-item.cc:848
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ážáŸ’រូវ​បាន​ážáž¼áž… ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នáŸáŸ‡â€‹áž‘áŸâ€‹ %s ។"
+
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្ážáž·ážâ€‹áž˜áŸ’រាម​ដៃ"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
+"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "កំពុង​ធ្វើអážáŸ’ážážŸáž‰áŸ’ញាណនា​.. "
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "បានទុក​ស្លាក ៖ %s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "កំពុង​រង់ចាំឌីស​...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "កំពុង​ស្កáŸáž“​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i áž“áž·áž„ áž ážáŸ’ážáž›áŸážáž¶ %i \n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "នោះមិនមែនជាឈ្មោះážáŸ’រឹមážáŸ’រូវទ០សូមព្យាយាម​ម្ដងទៀážÂ áŸ”\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"ឌីស​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ហៅ​ ៖ \n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "កំពុងសរសáŸážšâ€‹áž”ញ្ជី​ប្រភព​ážáŸ’មី\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "ធាážáž»áž”ញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នáŸáŸ‡áž‚ឺ ៖\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ áž‘áŸ..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "បានសរសáŸážš %i កំណážáŸ‹ážáŸ’រា ។\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "បានសរសáŸážš %i កំណážáŸ‹ážáŸ’រា​ជាមួយ​ %i ឯកសារ​ដែល​បាážáŸ‹áž”ង់ ។\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "បានសរសáŸážšâ€‹ %i កំណážáŸ‹ážáŸ’រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "បានសរសáŸážš %i កំណážáŸ‹ážáŸ’រា​ជាមួយ​ %i ឯកសារ​ដែល​បាážáŸ‹áž”ង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "កំពុងរៀបចំ​ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "កំពុង​ស្រាយ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "កំពុងរៀបចំ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "កំពុង​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "បាន​ដំឡើង %s"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចáŸáž‰â€‹áž“ៃ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "កំពុង​យក %s áž…áŸáž‰"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "បាន​យក %s áž…áŸáž‰"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "កំពុងរៀបចំ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "បរាជáŸáž™áž€áŸ’នុងការយក %s áž…áŸáž‰"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "បាន​បិទ​ការ​ážáž—្ជាប់​មុន​ពáŸáž›"
+
+#~ msgid "Reading file list"
+#~ msgstr "កំពុង​អាន​បញ្ជីឯកសារ​"
+
+#~ msgid "Could not execute "
+#~ msgstr "មិន​អាច​ដំណើរការ​ "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "កំពុងរៀបចំ​សម្រាប់​យក​ចáŸáž‰â€‹áž‡áž¶áž˜áž½áž™â€‹ážšáž…នាសម្ពáŸáž“្ធ %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "បានយកចáŸáž‰â€‹áž‡áž¶áž˜áž½áž™â€‹ážšáž…នាសម្ពáŸáž“្ធ %s"
diff --git a/po/ko.po b/po/ko.po
index fa14ee87d..b206f0c02 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,13 +1,14 @@
-# Changwoo Ryu <cwryu@debian.org>, 2004-2005.
-#
+# Sunjae Park <darehanl@gmail.com>, 2006.
+# Changwoo Ryu <cwryu@debian.org>, 2004-2005.
+#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-10 21:56+0900\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
-"Language-Team: Korean <cwryu@debian.org>\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-07-20 00:28+0900\n"
+"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
+"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -143,14 +144,14 @@ msgstr " 버전 í…Œì´ë¸”:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s), ì»´íŒŒì¼ ì‹œê° %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -224,6 +225,18 @@ msgstr ""
" -o=? ìž„ì˜ì˜ ì˜µì…˜ì„ ì„¤ì •í•©ë‹ˆë‹¤, 예를 들어 -o dir::cache=/tmp\n"
"좀 ë” ìžì„¸í•œ 정보는 apt-cache(8) ë° apt.conf(5) 매뉴얼 페ì´ì§€ë¥¼ 보십시오.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "ì´ ë””ìŠ¤í¬ë¥¼ 위해 'Debian 2.1r1 Disk 1'와 ê°™ì€ ì´ë¦„ì„ ì§€ì •í•´ì£¼ì‹­ì‹œì˜¤"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "ë“œë¼ì´ë¸Œì— 디스í¬ë¥¼ 넣고 엔터를 누르십시오"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "현재 ê°–ê³  있는 다른 CDì—ë„ ì´ ê³¼ì •ì„ ë°˜ë³µí•˜ì‹­ì‹œì˜¤."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "ì¸ìˆ˜ê°€ ë‘ ê°œê°€ 아닙니다"
@@ -285,7 +298,7 @@ msgstr ""
" -c=? 설정 파ì¼ì„ ì½ìŠµë‹ˆë‹¤\n"
" -o=? ìž„ì˜ì˜ ì˜µì…˜ì„ ì„¤ì •í•©ë‹ˆë‹¤, 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "%sì— ì“¸ 수 없습니다"
@@ -319,7 +332,6 @@ msgid "Error processing contents %s"
msgstr "%s 컨í…츠를 처리하는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -369,34 +381,34 @@ msgstr ""
" clean 설정\n"
"\n"
"apt-ftparchive는 ë°ë¹„안 ì•„ì¹´ì´ë¸Œìš© ì¸ë±ìŠ¤ 파ì¼ì„ 만듭니다. ì´ í”„ë¡œê·¸ëž¨ì€\n"
-"여러가지 ì¢…ë¥˜ì˜ ì¸ë±ìŠ¤ íŒŒì¼ ë§Œë“¤ê¸°ë¥¼ 지ì›í•©ë‹ˆë‹¤ -- 완전 ìžë™ì—서부터\n"
+"여러 ì¢…ë¥˜ì˜ ì¸ë±ìŠ¤ íŒŒì¼ ë§Œë“œëŠ” ìž‘ì—…ì„ ì§€ì›í•©ë‹ˆë‹¤ -- 완전 ìžë™í™” 작업부터\n"
"dpkg-scanpackages와 dpkg-scansourcesì˜ ê¸°ëŠ¥ì„ ëŒ€ì²´í•˜ê¸°ë„ í•©ë‹ˆë‹¤.\n"
"\n"
"apt-ftparchive는 .deb 파ì¼ì˜ 트리ì—서부터 Package 파ì¼ì„ 만듭니다.\n"
-"Package 파ì¼ì—는 ê° ê¾¸ëŸ¬ë¯¸ì˜ ëª¨ë“  컨트롤 필드는 물론 MD5 해시와 파ì¼\n"
-"í¬ê¸°ë„ 들어 있습니다. override 파ì¼ì„ ì´ìš©í•´ ìš°ì„  순위와 섹션 ê°’ì„ \n"
+"Package 파ì¼ì—는 ê° ê¾¸ëŸ¬ë¯¸ì˜ ëª¨ë“  제어 필드는 물론 MD5 해시와 파ì¼\n"
+"í¬ê¸°ë„ 들어 있습니다. override 파ì¼ì„ ì´ìš©í•´ Priority와 Sectionì˜ ê°’ì„ \n"
"강제로 설정할 수 있습니다\n"
"\n"
-"비슷하게 apt-ftparchive는 .dsc 파ì¼ì˜ 트리ì—서부터 Sources 파ì¼ì„\n"
+"ì´ì™€ 비슷하게 apt-ftparchive는 .dsc 파ì¼ì˜ 트리ì—ì„œ Sources 파ì¼ì„\n"
"만듭니다. --source-override ì˜µì…˜ì„ ì´ìš©í•´ 소스 override 파ì¼ì„\n"
"지정할 수 있습니다.\n"
"\n"
"'packages'와 'sources' ëª…ë ¹ì€ í•´ë‹¹ íŠ¸ë¦¬ì˜ ë§¨ 위ì—ì„œ 실행해야 합니다.\n"
-"\"ë°”ì´ë„ˆë¦¬ê²½ë¡œ\"는 서치할 ë•Œ 기준 위치를 가리켜야 하고 \"override파ì¼\"ì€\n"
-"override í”Œëž˜ê·¸ë“¤ì´ ë“¤ì–´ 있어야 합니다. \"경로앞부분\"ì€ ê°ê°ì˜ íŒŒì¼ ì´ë¦„\n"
-"í•„ë“œì— ë”í•´ 집니다. 예를 들어 ë°ë¹„안 ì•„ì¹´ì´ë¸ŒëŠ” 다ìŒê³¼ ê°™ì´ ì‚¬ìš©í•©ë‹ˆë‹¤:\n"
+"\"ë°”ì´ë„ˆë¦¬ê²½ë¡œ\"는 검색할 ë•Œì˜ ê¸°ì¤€ 위치를 가리키며 \"override파ì¼\"ì—는\n"
+"override í”Œëž˜ê·¸ë“¤ì„ ë‹´ê³  있습니다. \"경로앞부분\"ì€ ê° íŒŒì¼ ì´ë¦„\n"
+"í•„ë“œì˜ ì•žì— ë”í•´ 집니다. ë°ë¹„안 ì•„ì¹´ì´ë¸Œì— 있는 예를 하나 들ìžë©´:\n"
"\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
"옵션:\n"
" -h ì´ ë„움ë§\n"
-" --md5 MD5 만들기를 컨트롤합니다\n"
+" --md5 MD5 만들기 ìž‘ì—…ì„ ì œì–´í•©ë‹ˆë‹¤\n"
" -s=? 소스 override 파ì¼\n"
" -q 조용히\n"
" -d=? ìºì‹œ ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ì§ì ‘ 설정합니다\n"
" --no-delink 디버깅 모드 지우기를 사용합니다\n"
-" --contents 컨í…츠 파ì¼ì„ 만들기를 컨트롤합니다\n"
+" --contents 컨í…츠 파ì¼ì„ 만드는 ì ì—…ì„ ì œì–´í•©ë‹ˆë‹¤\n"
" -c=? ì´ ì„¤ì • 파ì¼ì„ ì½ìŠµë‹ˆë‹¤\n"
" -o=? ìž„ì˜ì˜ ì˜µì…˜ì„ ì„¤ì •í•©ë‹ˆë‹¤"
@@ -409,117 +421,128 @@ msgstr "맞는 꾸러미가 없습니다"
msgid "Some files are missing in the package file group `%s'"
msgstr "`%s' 꾸러미 íŒŒì¼ ê·¸ë£¹ì— ëª‡ëª‡ 파ì¼ì´ 빠졌습니다"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DBê°€ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤. íŒŒì¼ ì´ë¦„ì„ %s.oldë¡œ 바꿉니다"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DBê°€ 오래ë˜ì—ˆìŠµë‹ˆë‹¤. %sì˜ ì—…ê·¸ë ˆì´ë“œë¥¼ ì‹œë„합니다"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "DB 파ì¼, %s 파ì¼ì„ ì—´ 수 없습니다: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "%s 파ì¼ì˜ 마지막 수정 ì‹œê°ì´ 바뀌엇습니다"
+msgid "Failed to stat %s"
+msgstr "%sì˜ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "ì•„ì¹´ì´ë¸Œì— 컨트롤 기ë¡ì´ 없습니다"
-# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:267
+# FIXME: 왠 커서??
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "경고: %s 디렉토리를 ì½ì„ 수 없습니다\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "경고: %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "오류: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "경고: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "오류: ë‹¤ìŒ íŒŒì¼ì— ì ìš©í•˜ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤: "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "%sì˜ ê²½ë¡œë¥¼ 알아내는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "트리ì—ì„œ ì´ë™ì´ 실패했습니다"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "%s 파ì¼ì„ 여는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-# FIXME: ??
-#: ftparchive/writer.cc:245
+# FIXME: ??
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " ë§í¬ %s [%s] 없애기\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "%s 파ì¼ì— readlink하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "%s 파ì¼ì„ 지우는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s 파ì¼ì„ %s(으)ë¡œ ë§í¬í•˜ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %së°”ì´íŠ¸ì— ë„달했습니다.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%sì˜ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "ì•„ì¹´ì´ë¸Œì— 꾸러미 필드가 없습니다"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %sì—는 override í•­ëª©ì´ ì—†ìŠµë‹ˆë‹¤\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리ìžê°€ %s입니다 (%s 아님)\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %sì—는 override í•­ëª©ì´ ì—†ìŠµë‹ˆë‹¤\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %sì—는 override í•­ëª©ì´ ì—†ìŠµë‹ˆë‹¤\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -615,80 +638,79 @@ msgstr "%sì˜ ë§í¬ë¥¼ 해제하는 ë° ë¬¸ì œê°€ 있습니다"
msgid "Failed to rename %s to %s"
msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "ì •ê·œì‹ ì»´íŒŒì¼ ì˜¤ë¥˜ - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ì˜ ì˜ì¡´ì„±ì´ 맞지 않습니다:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 꾸러미를 설치했습니다"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 꾸러미를 설치할 것입니다"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "하지만 ê°€ìƒ ê¾¸ëŸ¬ë¯¸ìž…ë‹ˆë‹¤"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "하지만 %s 꾸러미를 설치하지 ì•Šì„ ê²ƒìž…ë‹ˆë‹¤"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " 혹ì€"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "ë‹¤ìŒ ìƒˆ 꾸러미를 설치할 것입니다:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 지울 것입니다:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 과거 버전으로 유지합니다:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 업그레ì´ë“œí•  것입니다:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 다운그레ì´ë“œí•  것입니다:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "ê³ ì •ë˜ì—ˆë˜ ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 바꿀 것입니다:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문ì—) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -696,180 +718,181 @@ msgstr ""
"경고: ê¼­ 필요한 ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ 지우게 ë©ë‹ˆë‹¤.\n"
"무슨 ì¼ì„ 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%luê°œ 업그레ì´ë“œ, %luê°œ 새로 설치, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%luê°œ 업그레ì´ë“œ, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%luê°œ 지우기 ë° %luê°œ 업그레ì´ë“œ 안 함.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "ì˜ì¡´ì„±ì„ 바로잡는 중입니다..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " 실패."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "ì˜ì¡´ì„±ì„ ë°”ë¡œìž¡ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "업그레ì´ë“œ ì§‘í•©ì„ ìµœì†Œí™”í•  수 없습니다"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 완료"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"ì´ ìƒí™©ì„ 바로잡으려면 `apt-get -f install'ì„ ì‹¤í–‰í•´ì•¼ í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "ì˜ì¡´ì„±ì´ 맞지 않습니다. -f ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "경고: ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ ì¸ì¦í•  수 없습니다!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "ì¸ì¦ 경고를 무시합니다.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "확ì¸í•˜ì§€ ì•Šê³  꾸러미를 설치하시겠습니까 [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "ì¸ì¦í•  수 없는 꾸러미가 있습니다"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "문제가 ë°œìƒí–ˆê³  -y ì˜µì…˜ì´ --force-yes 옵션 ì—†ì´ ì‚¬ìš©ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "내부 오류. ë§ê°€ì§„ 꾸러미ì—ì„œ InstallPackages를 호출했습니다!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "꾸러미를 지워야 하지만 지우기가 금지ë˜ì–´ 있습니다."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "diversionì„ ì¶”ê°€í•˜ëŠ” ë° ë‚´ë¶€ 오류"
+msgstr "내부 오류. ìˆœì„œë³€ê²½ìž‘ì—…ì´ ë나지 않았습니다"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "소스 목ë¡ì„ ì½ì„ 수 없습니다."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"ì´ìƒí•˜ê²Œë„ í¬ê¸°ê°€ 서로 다릅니다. apt@packages.debian.orgë¡œ ì´ë©”ì¼ì„ 보내주십"
+"시오."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%së°”ì´íŠ¸/%së°”ì´íŠ¸ ì•„ì¹´ì´ë¸Œë¥¼ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%së°”ì´íŠ¸ ì•„ì¹´ì´ë¸Œë¥¼ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì„ ë” ì‚¬ìš©í•˜ê²Œ ë©ë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì´ ë¹„ì›Œì§‘ë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "%sì— ì¶©ë¶„í•œ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤"
+msgstr "%sì˜ ì—¬ìœ  ê³µê°„ì˜ í¬ê¸°ë¥¼ 파악할 수 없습니다"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s ì•ˆì— ì¶©ë¶„í•œ 여유 ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"사소한 작업만 가능하ë„ë¡(Trivial Only) 지정ë˜ì—ˆì§€ë§Œ ì´ ìž‘ì—…ì€ ì‚¬ì†Œí•œ ìž‘ì—…ì´ "
"아닙니다."
-# ìž…ë ¥ì„ ë°›ì•„ì•¼ 한다. 한글 ìž…ë ¥ì„ ëª» í•  수 있으므로 ì›ë¬¸ 그대로 사용.
-#: cmdline/apt-get.cc:864
+# ìž…ë ¥ì„ ë°›ì•„ì•¼ 한다. 한글 ìž…ë ¥ì„ ëª» í•  수 있으므로 ì›ë¬¸ 그대로 사용.
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"무언가 ì‹œìŠ¤í…œì— í•´ê°€ ë˜ëŠ” ìž‘ì—…ì„ í•˜ë ¤ê³  합니다.\n"
+"ì‹œìŠ¤í…œì— ë¬´ì–¸ê°€ í•´ê°€ ë˜ëŠ” ìž‘ì—…ì„ í•˜ë ¤ê³  합니다.\n"
"계ì†í•˜ì‹œë ¤ë©´ ë‹¤ìŒ ë¬¸êµ¬ë¥¼ 입력하십시오: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "중단."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "ê³„ì† í•˜ì‹œê² ìŠµë‹ˆê¹Œ [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "ì¼ë¶€ 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,48 +900,48 @@ msgstr ""
"ì•„ì¹´ì´ë¸Œë¥¼ ë°›ì„ ìˆ˜ 없습니다. ì•„ë§ˆë„ apt-get update를 실행해야 하거나 --fix-"
"missing ì˜µì…˜ì„ ì¤˜ì„œ 실행해야 í•  것입니다."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing 옵션과 ë™ì‹œì— 미디어 바꾸기는 현재 지ì›í•˜ì§€ 않습니다"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "빠진 꾸러미를 ë°”ë¡œìž¡ì„ ìˆ˜ 없습니다."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "설치를 중단합니다."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "주ì˜, %2$s ëŒ€ì‹ ì— %1$s 꾸러미를 ì„ íƒí•©ë‹ˆë‹¤\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s 꾸러미를 건너 ëœë‹ˆë‹¤. ì´ë¯¸ 설치ë˜ì–´ 있고 업그레ì´ë“œë¥¼ 하지 않습니다.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s 꾸러미는 ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ê°€ 제공하는 ê°€ìƒ ê¾¸ëŸ¬ë¯¸ìž…ë‹ˆë‹¤:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [설치함]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "설치하려면 분명하게 하나를 ì„ íƒí•´ì•¼ 합니다."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -929,49 +952,49 @@ msgstr ""
"해당 꾸러미가 누ë½ë˜ì—ˆê±°ë‚˜ 지워졌다는 뜻입니다. 아니면 ë˜ ë‹¤ë¥¸ ê³³ì—ì„œ\n"
"꾸러미를 받아와야 하는 ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "하지만 ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ê°€ 대체합니다:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s 꾸러미를 다시 설치하는 ê±´ 불가능합니다. ë‚´ë ¤ ë°›ì„ ìˆ˜ 없습니다.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 꾸러미는 ì´ë¯¸ 최신 버전입니다.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s ê¾¸ëŸ¬ë¯¸ì˜ '%1$s' 릴리즈를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s ê¾¸ëŸ¬ë¯¸ì˜ '%1$s' ë²„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s ê¾¸ëŸ¬ë¯¸ì˜ %1$s (%2$s) ë²„ì „ì„ ì„ íƒí•©ë‹ˆë‹¤\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "update ëª…ë ¹ì€ ì¸ìˆ˜ë¥¼ 받지 않습니다"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "ëª©ë¡ ë””ë ‰í† ë¦¬ë¥¼ 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -979,26 +1002,45 @@ msgstr ""
"ì¼ë¶€ ì¸ë±ìŠ¤ 파ì¼ì„ 내려받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 해당 파ì¼ì„ 무시하거나 ê³¼ê±°ì˜ ë²„"
"ì „ì„ ëŒ€ì‹  사용합니다."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "ì´ ìƒí™©ì„ 해결하는 ë° ë‹¤ìŒ ì •ë³´ê°€ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "내부 오류, 문제 í•´ê²° í”„ë¡œê·¸ëž¨ì´ ì‚¬ê³ ì³¤ìŠµë‹ˆë‹¤"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgradeë•Œë¬¸ì— ë§ê°€ì¡ŒìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주ì˜, ì •ê·œì‹ '%2$s'ì— ëŒ€í•˜ì—¬ %1$sì„(를) ì„ íƒí•©ë‹ˆë‹¤\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다ìŒì„ 바로잡으려면 `apt-get -f install'ì„ ì‹¤í–‰í•´ 보십시오:"
-# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1529
+# FIXME: specify a solution? 무슨 솔루션?
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1048,7 @@ msgstr ""
"ì˜ì¡´ì„±ì´ 맞지 않습니다. 꾸러미 ì—†ì´ 'apt-get -f install'ì„ ì‹œë„í•´ 보십시오 "
"(아니면 í•´ê²° ë°©ë²•ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1017,7 +1059,7 @@ msgstr ""
"불안정 ë°°í¬íŒì„ 사용해서 ì¼ë¶€ 필요한 꾸러미를 ì•„ì§ ë§Œë“¤ì§€ 않았거나,\n"
"ì•„ì§ Incomingì—ì„œ 나오지 ì•Šì€ ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1026,115 +1068,115 @@ msgstr ""
"í•œ 가지 ìž‘ì—…ë§Œì„ ìš”ì²­í•˜ì…¨ìœ¼ë¯€ë¡œ, ì•„ë§ˆë„ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ 설치할 수\n"
"없는 ê²½ìš°ì¼ ê²ƒì´ê³  ì´ ê¾¸ëŸ¬ë¯¸ì— ë²„ê·¸ 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "ì´ ìƒí™©ì„ 해결하는 ë° ë‹¤ìŒ ì •ë³´ê°€ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "ë§ê°€ì§„ 꾸러미"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ ë” ì„¤ì¹˜í•  것입니다:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "업그레ì´ë“œë¥¼ 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "내부 오류, AllUpgradeë•Œë¬¸ì— ë§ê°€ì¡ŒìŠµë‹ˆë‹¤"
+msgstr "내부 오류, 문제 í•´ê²° í”„ë¡œê·¸ëž¨ì´ ì‚¬ê³ ì³¤ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "해당ë˜ëŠ” 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%sì˜ ì†ŒìŠ¤ 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ì´ë¯¸ 다운로드 ë°›ì€ íŒŒì¼ '%s'ì€(는) 다시 받지 ì•Šê³  건너 ëœë‹ˆë‹¤.\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%sì— ì¶©ë¶„í•œ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸/%së°”ì´íŠ¸ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "ì¼ë¶€ ì•„ì¹´ì´ë¸Œë¥¼ 가져오는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%sì— ì´ë¯¸ 풀려 있는 ì†ŒìŠ¤ì˜ ì••ì¶•ì„ í’€ì§€ ì•Šê³  건너 ëœë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "'dpkg-dev' 꾸러미가 설치ë˜ì—ˆëŠ”지를 확ì¸í•´ì£¼ì‹­ì‹œì˜¤.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "해당ë˜ëŠ” 빌드 ì˜ì¡´ì„±ì„ 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„± 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ê¾¸ëŸ¬ë¯¸ì— ë¹Œë“œ ì˜ì¡´ì„±ì´ 없습니다.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1143,7 +1185,7 @@ msgstr ""
"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니"
"다"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1152,32 +1194,32 @@ msgstr ""
"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s ê¾¸ëŸ¬ë¯¸ì˜ ì‚¬ìš© 가능한 버"
"ì „ 중ì—서는 ì´ ë²„ì „ ìš”êµ¬ì‚¬í•­ì„ ë§Œì¡±ì‹œí‚¬ 수 없습니다"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %3$s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„±ì„ 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "빌드 ì˜ì¡´ì„±ì„ 처리하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "지ì›í•˜ëŠ” 모듈:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1357,19 +1399,19 @@ msgstr "ì´ìš© 가능 꾸러미 정보를 합칩니다"
msgid "Failed to create pipes"
msgstr "파ì´í”„ 만들기가 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "gzip ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "ì•„ì¹´ì´ë¸Œê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "tar ì²´í¬ì„¬ 실패, ì•„ì¹´ì´ë¸Œê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "ì•Œ 수 없는 TAR í—¤ë” íƒ€ìž… %u, 멤버 %s"
@@ -1426,11 +1468,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "%s/%s 설정 파ì¼ì´ 중복ë˜ì—ˆìŠµë‹ˆë‹¤"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "%s 파ì¼ì„ 쓰는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "%s 파ì¼ì„ 닫는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -1483,7 +1525,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s 파ì¼ì€ %s ê¾¸ëŸ¬ë¯¸ì— ìžˆëŠ” 파ì¼ì„ ë®ì–´ ì”니다"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "%sì„(를) ì½ì„ 수 없습니다"
@@ -1513,9 +1556,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "ì •ë³´ 디렉토리와 ìž„ì‹œ 디렉토리는 ê°™ì€ íŒŒì¼ ì‹œìŠ¤í…œì— ìžˆì–´ì•¼ 합니다"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "꾸러미 목ë¡ì„ ì½ëŠ” 중입니다"
@@ -1529,7 +1572,7 @@ msgstr "관리 디렉토리를 %sinfoë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
msgid "Internal error getting a package name"
msgstr "꾸러미 ì´ë¦„ì„ ê°€ì ¸ì˜¤ëŠ” ë° ë‚´ë¶€ 오류"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "íŒŒì¼ ëª©ë¡ì„ ì½ëŠ” 중입니다"
@@ -1575,10 +1618,6 @@ msgstr "diversionì„ ì¶”ê°€í•˜ëŠ” ë° ë‚´ë¶€ 오류"
msgid "The pkg cache must be initialized first"
msgstr "꾸러미 ìºì‹œë¥¼ 먼저 초기화해야 합니다"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "íŒŒì¼ ëª©ë¡ì„ ì½ëŠ” 중"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1644,20 +1683,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "%s ì•ˆì˜ CD-ROMì„ ë§ˆìš´íŠ¸ 해제할 수 없습니다. 사용 ì¤‘ì¼ ê²ƒìž…ë‹ˆë‹¤."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "파ì¼ì´ 없습니다"
+msgstr "디스í¬ê°€ 없습니다"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "파ì¼ì´ 없습니다"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "íŒŒì¼ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "íŒŒì¼ ë³€ê²½ ì‹œê°ì„ 설정하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -1785,7 +1823,7 @@ msgstr "ë°ì´í„° 소켓 ì—°ê²° 시간 초과"
msgid "Unable to accept connection"
msgstr "ì—°ê²°ì„ ë°›ì„ ìˆ˜ 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다"
@@ -1808,7 +1846,7 @@ msgstr "ë°ì´í„° 전송 실패, 서버ì—서는: %s"
msgid "Query"
msgstr "질ì˜"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "다ìŒì„ 실행할 수 없습니다: "
@@ -1837,75 +1875,74 @@ msgstr "%s:%sì— ì—°ê²°ì„ ì´ˆê¸°í™”í•  수 없습니다 (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%sì— ì—°ê²°í•  수 없습니다 (%s). ì—°ê²° 제한 ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%sì— ì—°ê²°í•  수 없습니다 (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "%sì— ì—°ê²°í•˜ëŠ” 중입니다"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'ì˜ ì£¼ì†Œë¥¼ 알아낼 수 없습니다"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'ì˜ ì£¼ì†Œë¥¼ 알아내는 ë° ìž„ì‹œë¡œ 실패했습니다"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "'%s:%s'ì˜ ì£¼ì†Œë¥¼ 알아내는 ë° ë¬´ì–¸ê°€ ì´ìƒí•œ ì¼ì´ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "%s %sì— ì—°ê²°í•  수 없습니다:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "키ë§ì— 접근할 수 없습니다: '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Acquire::gpgv::Optionsì˜ ì¸ìž 목ë¡ì´ 너무 ê¹ë‹ˆë‹¤. 종료하는 중."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "내부 오류: ì„œëª…ì€ ì˜¬ë°”ë¥´ì§€ë§Œ 키 ì§€ë¬¸ì„ í™•ì¸í•  수 없습니다!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "최소한 하나 ì´ìƒì˜ ì„œëª…ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "%s 잠금 파ì¼ì„ ì–»ì„ ìˆ˜ 없습니다"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "ì„œëª…ì„ ì¸ì¦í•˜ê¸° 위한 '%s'를 실행할 수 없습니다(gnupgê°€ 설치ë나요?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "gpgv 실행 ë„중 ì•Œ 수 없는 오류 ë°œìƒ"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ ë” ì„¤ì¹˜í•  것입니다:"
+msgstr "ë‹¤ìŒ ì„œëª…ì´ ì˜¬ë°”ë¥´ì§€ 않습니다:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+msgstr "ë‹¤ìŒ ì„œëª…ë“¤ì€ ê³µê°œí‚¤ê°€ 없기 ë•Œë¬¸ì— ì¸ì¦í•  수 없습니다:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1917,76 +1954,76 @@ msgstr "%sì— ëŒ€í•œ 파ì´í”„를 ì—´ 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "í—¤ë”를 기다리는 중입니다"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "í—¤ë” í•œ ì¤„ì— %u개가 넘는 문ìžê°€ 들어 있습니다"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "í—¤ë” ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ ì‘답 í—¤ë”를 보냈습니다"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Length í—¤ë”를 보냈습니다"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Range í—¤ë”를 보냈습니다"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP ì„œë²„ì— ë²”ìœ„ ì§€ì› ê¸°ëŠ¥ì´ ìž˜ëª»ë˜ì–´ 있습니다"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "ë°ì´í„° 형ì‹ì„ ì•Œ 수 없습니다"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "ì—°ê²° ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "출력 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "해당 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "서버ì—ì„œ ì½ê³  ì—°ê²°ì„ ë‹«ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "서버ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "í—¤ë” ë°ì´í„°ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "ì—°ê²°ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "내부 오류"
@@ -1999,7 +2036,7 @@ msgstr "빈 파ì¼ì— mmapí•  수 없습니다"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%luë°”ì´íŠ¸ë¥¼ mmapí•  수 없습니다"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "ì„ íƒí•œ %sì´(ê°€) 없습니다"
@@ -2120,7 +2157,7 @@ msgstr "ìž˜ëª»ëœ ìž‘ì—… %s"
msgid "Unable to stat the mount point %s"
msgstr "마운트 위치 %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "%s 디렉토리로 ì´ë™í•  수 없습니다"
@@ -2265,74 +2302,89 @@ msgstr "옵션"
msgid "extra"
msgstr "별ë„"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "ì˜ì¡´ì„± 트리를 만드는 중입니다"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "후보 버전"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "ì˜ì¡´ì„± 만들기"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "ì´ìš© 가능 꾸러미 정보를 합칩니다"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s 파ì¼ì„ 여는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s 파ì¼ì„ 쓰는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "꾸러미 íŒŒì¼ %s 파ì¼ì„ 파싱할 수 없습니다 (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "꾸러미 íŒŒì¼ %s 파ì¼ì„ 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (URI 파싱)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (절대 dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (dist 파싱)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s 파ì¼ì„ 여는 중입니다"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (타입)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "소스 리스트 %3$sì˜ %2$u번 ì¤„ì˜ '%1$s' íƒ€ìž…ì„ ì•Œ 수 없습니다"
+msgstr "소스 ëª©ë¡ %3$sì˜ %2$u번 ì¤„ì˜ '%1$s' íƒ€ìž…ì„ ì•Œ 수 없습니다"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (ë²¤ë” ID)"
@@ -2353,14 +2405,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "ì¸ë±ìŠ¤ íŒŒì¼ íƒ€ìž… '%s' íƒ€ìž…ì€ ì§€ì›í•˜ì§€ 않습니다"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"%s 꾸러미를 다시 설치해야 하지만, ì´ ê¾¸ëŸ¬ë¯¸ì˜ ì•„ì¹´ì´ë¸Œë¥¼ ì°¾ì„ ìˆ˜ 없습니다."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2368,7 +2420,7 @@ msgstr ""
"오류, pkgProblemResolver::Resolveê°€ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤, ê³ ì • ê¾¸ëŸ¬ë¯¸ë•Œë¬¸ì— ë°œìƒí•  수"
"ë„ ìžˆìŠµë‹ˆë‹¤."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 ë°”ë¡œìž¡ì„ ìˆ˜ 없습니다, ë§ê°€ì§„ ê³ ì • 꾸러미가 있습니다."
@@ -2382,10 +2434,17 @@ msgstr "ëª©ë¡ ë””ë ‰í† ë¦¬ %spartialì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤."
msgid "Archive directory %spartial is missing."
msgstr "ì•„ì¹´ì´ë¸Œ 디렉토리 %spartialì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "íŒŒì¼ ë°›ì•„ì˜¤ëŠ” 중: %2$li 중 %1$li (%3$s 남았ìŒ)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "íŒŒì¼ ë°›ì•„ì˜¤ëŠ” 중: %2$li 중 %1$li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2397,20 +2456,18 @@ msgstr "설치 방법 ë“œë¼ì´ë²„ %sì„(를) ì°¾ì„ ìˆ˜ 없습니다."
msgid "Method %s did not start correctly"
msgstr "설치 방법 %sì´(ê°€) 올바르게 시작하지 않았습니다"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"미디어 바꾸기: '%2$s' ë“œë¼ì´ë¸Œì— ë‹¤ìŒ ë ˆì´ë¸”ì´ ë‹¬ë¦°\n"
-"디스í¬ë¥¼ 넣고 enter를 누르십시오\n"
-" '%1$s'\n"
+"'%2$s' ë“œë¼ì´ë¸Œì— '%1$s'ë¡œ í‘œê¸°ëœ ë””ìŠ¤í¬ë¥¼ 삽입하고 엔터를 눌러주십시오."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "꾸러미 시스템 '%s'ì„(를) 지ì›í•˜ì§€ 않습니다"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 꾸러미 시스템 íƒ€ìž…ì„ ì•Œì•„ë‚¼ 수 없습니다"
@@ -2444,82 +2501,82 @@ msgstr "í•€ 타입 %sì´(ê°€0 무엇ì¸ì§€ ì´í•´í•  수 없습니다"
msgid "No priority (or zero) specified for pin"
msgstr "í•€ì— ìš°ì„ ìˆœìœ„(í˜¹ì€ 0)를 지정하지 않았습니다"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "ìºì‹œì˜ 버전 ì‹œìŠ¤í…œì´ í˜¸í™˜ë˜ì§€ 않습니다"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "%s 처리하는 ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "와우, ì´ APTê°€ 처리할 수 있는 패키지 ì´ë¦„ 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "와우, ì´ APTê°€ 처리할 수 있는 버전 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "와우, ì´ APTê°€ 처리할 수 있는 ì˜ì¡´ì„± 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "%s ì²˜ë¦¬ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "%s ì²˜ë¦¬ì¤‘ì— ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤ (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "íŒŒì¼ ì˜ì¡´ì„±ì„ 처리하는 ë°, %s %s 꾸러미가 없습니다"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "소스 꾸러미 ëª©ë¡ %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "파ì¼ì—ì„œ 제공하는 ê²ƒì„ ëª¨ìœ¼ëŠ” 중입니다"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "소스 ìºì‹œë¥¼ 저장하는 ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤"
@@ -2528,11 +2585,15 @@ msgstr "소스 ìºì‹œë¥¼ 저장하는 ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤
msgid "rename failed, %s (%s -> %s)."
msgstr "ì´ë¦„ 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sumì´ ë§žì§€ 않습니다"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "ë‹¤ìŒ í‚¤ IDì˜ ê³µê°œí‚¤ê°€ 없습니다:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2541,7 +2602,7 @@ msgstr ""
"%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ"
"니다. (아키í…ì³ê°€ 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2550,14 +2611,14 @@ msgstr ""
"%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ"
"니다."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s ê¾¸ëŸ¬ë¯¸ì— Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "í¬ê¸°ê°€ 맞지 않습니다"
@@ -2661,55 +2722,65 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 íŒŒì¼ %i개가 빠지고 %i개가 맞지 ì•Šì€ ìƒíƒœë¡œ ì¼ìŠµë‹ˆë‹¤\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "%s 파ì¼ì„ 여는 중입니다"
+msgstr "%s 준비 중"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "%s 파ì¼ì„ 여는 중입니다"
+msgstr "%sì„(를) 푸는 중입니다"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "설정 íŒŒì¼ %s 파ì¼ì„ 여는 중입니다"
+msgstr "%sì„(를) 설정할 준비를 하는 중입니다"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "%sì— ì—°ê²°í•˜ëŠ” 중입니다"
+msgstr "%s 설정 중"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " 설치: "
+msgstr "%s 설치했ìŒ"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%sì„(를) 삭제할 준비 중"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "%s 파ì¼ì„ 여는 중입니다"
+msgstr "%s 지우는 중"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "추천"
+msgstr "%s 지움"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "%sì„(를) 완전히 지울 준비를 하는 중입니다"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "%sì„(를) 완전히 지웠습니다"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "ì—°ê²°ì´ ë„ˆë¬´ 빨리 ëŠì–´ì¡ŒìŠµë‹ˆë‹¤"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "%s 파ì¼ì˜ 마지막 수정 ì‹œê°ì´ 바뀌엇습니다"
+
+#~ msgid "Reading file list"
+#~ msgstr "íŒŒì¼ ëª©ë¡ì„ ì½ëŠ” 중"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "%s 잠금 파ì¼ì„ ì–»ì„ ìˆ˜ 없습니다"
diff --git a/po/makefile b/po/makefile
index bb8118c77..07dc51c07 100644
--- a/po/makefile
+++ b/po/makefile
@@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot :
--files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
rm -f $(PO)/POTFILES_$*.in
$(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+ # copy into the domain dirs to make rosetta happy
+ rm -f $(PO)/domains/$*/*.pot
+ cp $@ $(PO)/domains/$*
$(PACKAGE)-all.pot: $(POTFILES)
$(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
@@ -66,7 +69,7 @@ binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
.PHONY: update-po
update-po: $(PACKAGE)-all.pot
- for lang in ${LINGUAS}; do\
+ for lang in ${LINGUAS}; do \
echo "Updating $$lang.po"; \
$(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \
cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \
@@ -74,7 +77,7 @@ update-po: $(PACKAGE)-all.pot
done
clean: clean/local
-clean/local:
+clean/local: update-po
rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
# Include the dependencies that are available
diff --git a/po/nb.po b/po/nb.po
index a0383d334..d1b01881b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -160,14 +160,14 @@ msgstr " Versjonstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert på %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -242,6 +242,22 @@ msgstr ""
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
"Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Bytte av media: sett inn CD-en som er merket\n"
+" «%s»\n"
+"i «%s» og trykk «Enter»\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Ikke parvise argumenter"
@@ -304,7 +320,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
@@ -429,115 +445,126 @@ msgstr "Ingen utvalg passet"
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer mangler i pakkegruppa «%s»"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Databasen er gammel, forsøker å oppgradere %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikke å åpne Databasefila %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Fildatoen er endret %s"
+msgid "Failed to stat %s"
+msgstr "Klarte ikke å få statusen på %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Klarte ikke å lese katalogen %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Klarte ikke å få statusen på %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F:"
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A:"
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikke å slå opp %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Klarte ikke å finne fram i treet"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikke å åpne %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikke å lese lenken %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikke å oppheve lenken %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikke å lenke %s til %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Klarte ikke å få statusen på %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s har ingen overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s har ingen overstyringsoppføring\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -633,79 +660,79 @@ msgstr "Problem ved oppheving av lenken til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikke å endre navnet på %s til %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil bli installert:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil bli FJERNET:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er holdt tilbake:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil bli oppgradert:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil bli NEDGRADERT:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Følgende pakker vil bli endret:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -714,145 +741,145 @@ msgstr ""
"ADVARSEL: Følgende kjernepakker vil bli fjernet\n"
"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Retter på avhengighetsforhold ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislyktes."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Klarer ikke å rette på avhengighetsforholdene"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Klarer ikke å minimere oppgraderingsettet"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Utført"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Noen pakker ble ikke autentisert"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Det oppsto en intern feil når avledningen ble lagt til"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Må hente %sB/%sB med arkiver.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Må hente %sB med arkiver.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Dessverre, ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gjør som jeg sier!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -863,28 +890,28 @@ msgstr ""
"For å fortsette, skriv: «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -892,48 +919,48 @@ msgstr ""
"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
"«--fix-missing»."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "«--fix-missing» og bytte av media støttes nå ikke"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Klarer ikke å rette på manglende pakker."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryter istallasjonen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Merk, velger %s istedenfor %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du må velge en pakke som skal installeres."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,49 +971,49 @@ msgstr ""
"Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
"tilgjengelig fra en annen kilde.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Følgende pakker erstatter den imidlertid:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installasjonskandidat"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er allerede nyeste versjon.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgave «%s» av «%s» ble ikke funnet"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versjon «%s» av «%s» ble ikke funnet"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kan ikke låse listemappa"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -994,25 +1021,44 @@ msgstr ""
"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
"ble brukt isteden. "
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil - «AllUpgrade» ødela noe"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - «AllUpgrade» ødela noe"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke å finne pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1066,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
"angi en løsning)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1032,7 +1078,7 @@ msgstr ""
"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1042,122 +1088,123 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du bør fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Følgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Foreslåtte pakker:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Utført"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil - «AllUpgrade» ødela noe"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1166,32 +1213,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1373,19 +1420,19 @@ msgstr "Fletter tilgjengelig informasjon"
msgid "Failed to create pipes"
msgstr "Klarte ikke å opprette rør"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Klarte ikke å kjøre gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Ødelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjent TAR-hode: type %u, medlem %s"
@@ -1446,7 +1493,7 @@ msgstr "Dobbel oppsettsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Klarte ikke å skrive fila %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikke å lukke fila %s"
@@ -1499,7 +1546,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke å lese %s"
@@ -1530,9 +1578,9 @@ msgstr ""
"Infokatalogen og den midlertidige katalogen må være på det samme filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Leser pakkelister"
@@ -1546,7 +1594,7 @@ msgstr "Klarte ikke å bytte til adminkatalogen %sinfo"
msgid "Internal error getting a package name"
msgstr "Intern feil ved henting av pakkenavn"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Les filliste"
@@ -1593,10 +1641,6 @@ msgstr "Det oppsto en intern feil når avledningen ble lagt til"
msgid "The pkg cache must be initialized first"
msgstr "Pakkelageret må klargjøres først"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Leser filliste"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1673,12 +1717,12 @@ msgstr "Fant ikke fila"
msgid "File not found"
msgstr "Fant ikke fila"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -1806,7 +1850,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke å godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
@@ -1829,7 +1873,7 @@ msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
msgid "Query"
msgstr "Spørring"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Klarte ikke å starte"
@@ -1858,71 +1902,71 @@ msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikke å koble til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Kobler til %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikke å slå opp «%s»"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig feil ved oppslag av «%s»"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Klarte ikke å koble til %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Klarte ikke å slå opp «%s»"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Får ikke låst %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Følgende ekstra pakker vil bli installert."
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1938,76 +1982,76 @@ msgstr "Klarte ikke å åpne rør for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Venter på hoder"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ødelagt hodelinje"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ødelagte hodedata"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern feil"
@@ -2020,7 +2064,7 @@ msgstr "Kan ikke utføre mmap på en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2141,7 +2185,7 @@ msgstr "Ugyldig operasjon %s"
msgid "Unable to stat the mount point %s"
msgstr "Klarer ikke å fastsette monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Klarer ikke å endre %s"
@@ -2286,74 +2330,89 @@ msgstr "valgfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versjons-kandidater"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Oppretter avhengighetsforhold"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Fletter tilgjengelig informasjon"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive fila %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Klarer ikke å fortolke pakkefila %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil på linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil på %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Åpner %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil på %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Feil på %u i kildelista %s (selgers id)"
@@ -2374,14 +2433,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Oversiktsfil av typen «%s» støttes ikke"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2389,7 +2448,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
@@ -2403,11 +2462,18 @@ msgstr "Listemappa %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2418,7 +2484,7 @@ msgstr "Finner ikke metode-driveren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startet ikke korrekt"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2426,12 +2492,12 @@ msgstr ""
" «%s»\n"
"i «%s» og trykk «Enter»\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» støttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2467,82 +2533,82 @@ msgstr "Forsto ikke spikring av typen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Lageret har et uoverensstemmende versjonssystem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Feil oppsto under behandling av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Feil oppsto under behandling av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Feil oppsto under behandling av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Feil oppsto under behandling av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Feil oppsto under behandling av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Feil oppsto under behandling av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Feil oppsto under behandling av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samler inn filtilbud"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
@@ -2551,11 +2617,15 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2564,7 +2634,7 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2573,13 +2643,13 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Feil størrelse"
@@ -2723,18 +2793,28 @@ msgid "Removed %s"
msgstr "Anbefaler"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Åpner oppsettsfila %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Klarte ikke å fjerne %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen ble uventet stengt"
+#~ msgid "File date has changed %s"
+#~ msgstr "Fildatoen er endret %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Leser filliste"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Får ikke låst %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Ukjent selger ID «%s» i linje %u i kildelista %s"
diff --git a/po/ne.po b/po/ne.po
new file mode 100644
index 000000000..595488d4c
--- /dev/null
+++ b/po/ne.po
@@ -0,0 +1,2728 @@
+# translation of apt_po.po to Nepali
+# Mahesh Subedi <submanesh@hotmail.com>, 2006.
+# Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.
+# Shiva Pokharel <pokharelshiva@hotmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: apt_po\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-27 13:46+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
+"X-Generator: KBabel 1.10.2\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s संसà¥à¤•à¤°à¤£ %s संग à¤à¤‰à¤Ÿà¤¾ नभेटिà¤à¤•à¥‹ dep छ:\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s तोकà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "कूल पà¥à¤¯à¤¾à¤•à¥‡à¤œ नामहरू :"
+
+#: cmdline/apt-cache.cc:272
+msgid " Normal packages: "
+msgstr " सामानà¥à¤¯ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:273
+msgid " Pure virtual packages: "
+msgstr "शà¥à¤¦à¥à¤§ अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:274
+msgid " Single virtual packages: "
+msgstr " à¤à¤•à¤² अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:275
+msgid " Mixed virtual packages: "
+msgstr " मिशà¥à¤°à¤¿à¤¤ अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:276
+msgid " Missing: "
+msgstr " हराइरहेको:"
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "कूल भिनà¥à¤¨ संसà¥à¤•à¤°à¤£à¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "कूल निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "जमà¥à¤®à¤¾ ver/file समà¥à¤¬à¤¨à¥à¤§à¤¹à¤°à¥‚: "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "कूल उपलबà¥à¤§ मानचितà¥à¤°à¤£à¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "कूल विशà¥à¤µà¤µà¥à¤¯à¤¾à¤ªà¥€ सà¥à¤Ÿà¥à¤°à¤¿à¤™à¥à¤—हरू:"
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "कूल निरà¥à¤­à¤°à¤¤à¤¾ संसà¥à¤•à¤°à¤£ खाली ठाऊà¤:"
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "कूल शिथिल खाली ठाऊà¤:"
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "को लागि कूल खाली ठाऊठलेखांकन:"
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल %s sync भनà¥à¤¦à¤¾ बाहिर छ ।"
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "तपाईà¤à¤²à¥‡ à¤à¤‰à¤Ÿà¤¾ वासà¥à¤¤à¤µà¤¿à¤• बानà¥à¤•à¥€ दिनà¥à¤ªà¤°à¥à¤›"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "कà¥à¤¨à¥ˆ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ फेला परेन"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइलहरू:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "कà¥à¤¯à¤¾à¤¸ sync भनà¥à¤¦à¤¾ बाहिर छ, पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल x-ref गरà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨"
+
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "पिन गरिà¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(फेला परेन)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid " Installed: "
+msgstr " सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो:"
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(कà¥à¤¨à¥ˆ पनि होइन)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid " Candidate: "
+msgstr " उमेदà¥à¤µà¤¾à¤°:"
+
+#: cmdline/apt-cache.cc:1532
+msgid " Package pin: "
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ पिन:"
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid " Version table:"
+msgstr " संसà¥à¤•à¤°à¤£ तालिका:"
+
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s को लागि %s %s, %s %s मा कमà¥à¤ªà¤¾à¤à¤² गरिà¤à¤•à¥‹ छ\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"उपयोग: apt-cache [विकलà¥à¤ªà¤¹à¤°à¥‚] आदेश\n"
+" apt-cache [विकलà¥à¤ªà¤¹à¤°à¥‚] फाइल १ थपà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ [फाइल २ ...]\n"
+" apt-cache [विकलà¥à¤ªà¤¹à¤°à¥‚] pkg pkg1 देखाउनà¥à¤¹à¥‹à¤¸à¥ [pkg2 ...]\n"
+" apt-cache [विकलà¥à¤ªà¤¹à¤°à¥‚] src pkg1 देखाउनà¥à¤¹à¥‹à¤¸à¥ [pkg2 ...]\n"
+"\n"
+"तिनीहरà¥à¤¬à¤¾à¤Ÿ APT's बिनारी कà¥à¤¯à¤¾à¤¸ फाइलहरू, र कà¥à¤µà¥‡à¤°à¥€ सूचना मिलाउन पà¥à¤°à¤¯à¥‹à¤— गरिने apt-cache "
+"कम-सà¥à¤¤à¤°à¤•à¥‹ उपकरण हो\n"
+"\n"
+"\n"
+"आदेशहरू:\n"
+" थपà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - सà¥à¤°à¥‹à¤¤ कà¥à¤¯à¤¾à¤¸à¤®à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल थपà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" gencaches - पà¥à¤¯à¤¾à¤•à¥‡à¤œ र सà¥à¤°à¥‹à¤¤ कà¥à¤¯à¤¾à¤¸ दà¥à¤µà¥ˆ निरà¥à¤®à¤¾à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" showpkg - à¤à¤•à¤² पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि केही सामानà¥à¤¯ सूचनाहरू देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" showsrc - सà¥à¤°à¥‹à¤¤ रेकरà¥à¤¡à¤¹à¤°à¥‚ देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" stats - केही आधारभूत तथà¥à¤¯à¤¾à¤‚कशासà¥à¤¤à¥à¤° हरू देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" dump - पà¥à¤°à¥ˆ फाइल सà¥à¤ªà¤·à¥à¤Ÿ रà¥à¤ªà¤®à¤¾ देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" dumpavail - stdout मा à¤à¤‰à¤Ÿà¤¾ उपलबà¥à¤§ फाइल मà¥à¤¦à¥à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" unmet - नभेटिà¤à¤•à¤¾ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" खोजी गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - regex बानà¥à¤•à¥€à¤•à¥‹ लागि पà¥à¤¯à¤¾à¤•à¥‡à¤œ सूचि खोजी गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" देखाउनà¥à¤¹à¥‹à¤¸à¥ - पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि पढà¥à¤¨à¤¯à¥‹à¤—à¥à¤¯ रेकरà¥à¤¡ देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" आधारित - पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि कचà¥à¤šà¤¾ निरà¥à¤­à¤°à¤¤à¤¾ सूचना देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" rdepends - पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि उलà¥à¤Ÿà¥‹ निरà¥à¤­à¤°à¤¤à¤¾ सूचना देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" pkgnames - सबै पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ नामहरू सूचिबदà¥à¤§ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" dotty - GraphVis को लागि पà¥à¤¯à¤¾à¤•à¥‡à¤œ गà¥à¤°à¤¾à¤«à¤¹à¤°à¥‚ सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" xvcg - xvcg को लागि पà¥à¤¯à¤¾à¤•à¥‡à¤œ गà¥à¤°à¤¾à¤«à¤¹à¤°à¥‚ सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" नीति - नीति सेटिङà¥à¤—हरू देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ ।\n"
+" -p=? पà¥à¤¯à¤¾à¤•à¥‡à¤œ कà¥à¤¯à¤¾à¤¸ ।\n"
+" -s=? सà¥à¤°à¥‹à¤¤ कà¥à¤¯à¤¾à¤¸ ।\n"
+" -q पà¥à¤°à¤—ति सूचक अकà¥à¤·à¤® गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+" -i नभेटिà¤à¤•à¥‹ आदेशको लागि महतà¥à¤µà¤ªà¥‚रà¥à¤£ deps देखाउनà¥à¤¹à¥‹à¤¸à¥ ।\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन फाइल सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ -o dir::cache=/tmp\n"
+"धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) मà¥à¤¯à¤¾à¤¨à¥à¤² पृषà¥à¤Ÿà¤¹à¤°à¥‚ हेरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "कृपया यो डिसà¥à¤•à¤•à¥‹ लागि नाम उपलबà¥à¤§ गराउनà¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "कृपया डà¥à¤°à¤¾à¤‡à¤­à¤®à¤¾ डिसà¥à¤• घà¥à¤¸à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ र इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "तपाईà¤à¤•à¥‹ सेटमा बाà¤à¤•à¥€ सि डि हरà¥à¤•à¥‹ लागि यो पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ फेरी गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । "
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "तरà¥à¤•à¤¹à¤°à¥‚ जोडामा छैन"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयग: apt-config [विकलà¥à¤ªà¤¹à¤°à¥‚] आदेश\n"
+"\n"
+" APT कनफिग फाइल पढà¥à¤¨à¤•à¥‹ लागि apt-config साधारण उपकरण हो\n"
+"\n"
+"आदेशहरू:\n"
+" शेल - शेल मोड\n"
+" dump - कनफिगरेसन देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ ।\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन विकलà¥à¤ª सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s वैध DEB पà¥à¤¯à¤¾à¤•à¥‡à¤œ होइन"
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤¬à¤¾à¤Ÿ कनफिगरेसन र टेमà¥à¤ªà¥à¤²à¥‡à¤Ÿ सूचना à¤à¤¿à¤•à¥à¤¨à¥‡ उपकरण हो\n"
+"\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ\n"
+" -t टेमà¥à¤ªà¥à¤²à¥‡à¤Ÿ डाइरेकà¥à¤Ÿà¥à¤°à¥€ सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन विकलà¥à¤ª सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेखà¥à¤¨ असकà¥à¤·à¤®"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr " debconf संसà¥à¤•à¤°à¤£ पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ सकिà¤à¤¨ । के debconf सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो ? "
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ विसà¥à¤¤à¤¾à¤° सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "सà¥à¤°à¥‹à¤¤ विसà¥à¤¤à¤¾à¤° सूचि अति लामो छ"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "सामागà¥à¤°à¥€ फाइलहरà¥à¤®à¤¾ हेडर लेखà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "सामगà¥à¤°à¥€ %sपà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"उपयोग: apt-ftparchive [विकलà¥à¤ªà¤¹à¤°à¥‚] आदेश\n"
+"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive ले डेवियन संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ लागि अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरू सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¦à¤› । यसले "
+"समरà¥à¤¥à¤¨ गरà¥à¤¦à¤›\n"
+"dpkg-scanpackages र dpkg-scansources को लागि कारà¥à¤¯à¤¾à¤¤à¥à¤®à¤• पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤®à¤¾ पà¥à¤°à¥ˆ "
+"सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤à¤¬à¤¾à¤Ÿ सिरà¥à¤œà¤¨à¤¾à¤•à¥‹ धेरै शैलीहरू\n"
+" \n"
+"\n"
+"apt-ftparchive ले debs को टà¥à¤°à¥€à¤¬à¤¾à¤Ÿ पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइलहरू सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¦à¤› । पà¥à¤¯à¤¾à¤•à¥‡à¤œ\n"
+"फाइलहरà¥à¤²à¥‡ पà¥à¤°à¤¤à¥à¤¯à¥‡à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¬à¤¾à¤Ÿ सबै नियनà¥à¤¤à¥à¤°à¤£ फाà¤à¤Ÿà¤¹à¤°à¥à¤•à¥‹ सामगà¥à¤°à¥€à¤¹à¤°à¥‚ साथ साथै MD5 hash र "
+"filesize समावेश गरà¥à¤¦à¤› ।\n"
+"à¤à¤‰à¤Ÿà¤¾ अधिलेखन फाइल\n"
+"पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾ र सेकà¥à¤¸à¤¨à¤•à¥‹ मान जोड गरà¥à¤¨ समरà¥à¤¥à¤¿à¤¤ हà¥à¤¨à¥à¤› ।\n"
+"\n"
+"तà¥à¤¯à¤¸à¥à¤¤à¥ˆ गरी apt-ftparchive ले .dscs को टà¥à¤°à¥€à¤¬à¤¾à¤Ÿ सà¥à¤°à¥‹à¤¤ फाइलहरू सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¦à¤› ।\n"
+"सà¥à¤°à¥‹à¤¤--अधिलेखन--विकलà¥à¤ª src अधीलेखन फाइल निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨ सकिनà¥à¤›\n"
+"\n"
+"'packages' and 'sources' आदेश टà¥à¤°à¥€à¤•à¥‹ मूलमा चलाउन सकिनà¥à¤› ।\n"
+" विनारी मारà¥à¤— फेरी हà¥à¤¨à¥‡ खोजीको विनà¥à¤¦à¥à¤®à¤¾ आधारित हà¥à¤¨à¥à¤› र \n"
+"अधिलेखन फाइलले अधिलेखन à¤à¤£à¥à¤¡à¤¾à¤¹à¤°à¥‚ समाविषà¥à¤Ÿ गरà¥à¤¦à¤› । यदि उपसà¥à¤¥à¤¿à¤¤ छ भने बाटो उपसरà¥à¤—\n"
+"फाइलनाम फाà¤à¤Ÿà¤¹à¤°à¥à¤®à¤¾ थपिनà¥à¤› । उदाहरणको लागि \n"
+"डेवियन संगà¥à¤°à¤¹à¤¬à¤¾à¤Ÿ उपयोग:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ\n"
+" --md5 नियनà¥à¤¤à¥à¤°à¤£ MD5 सिरà¥à¤œà¤¨à¤¾\n"
+" -s=? सà¥à¤°à¥‹à¤¤ अधिलेखन फाइल\n"
+" -q बनà¥à¤¦ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -d=? वैकलà¥à¤ªà¤¿à¤• कà¥à¤¯à¤¾à¤¸à¤¿à¤™ डेटाबेस चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" --no-delink delinking डिबग मोड सकà¥à¤·à¤® गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" --सामगà¥à¤°à¥€à¤¹à¤°à¥‚ सामगà¥à¤°à¥€ फाइल सिरà¥à¤œà¤¨à¤¾ नियनà¥à¤¤à¥à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन विकलà¥à¤ª सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "कà¥à¤¨à¥ˆ चयनहरू मेल खाà¤à¤¨"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "केही फाइलहरू पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल समूह `%s' मा हराइरहेको छ"
+
+#: ftparchive/cachedb.cc:45
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB दूषित थियो, फाइल %s.पà¥à¤°à¤¾à¤¨à¥‹ मा पà¥à¤¨:नामकरण गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB पà¥à¤°à¤¾à¤¨à¥‹ छ, %s सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿ गरà¥à¤¨ पà¥à¤°à¤¯à¤¾à¤¸ गरिदैछ"
+
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB फाइल %s असकà¥à¤·à¤® भयो: %s"
+
+#: ftparchive/cachedb.cc:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "फाइल डेटाले %s परिवरà¥à¤¤à¤¨ गरà¥à¤¯à¥‹"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "संगà¥à¤°à¤¹ संग नियनà¥à¤¤à¥à¤°à¤£ रेकरà¥à¤¡ छैन"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "करà¥à¤¸à¤° पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: ftparchive/writer.cc:78
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s पढà¥à¤¨ असकà¥à¤·à¤®\n"
+
+#: ftparchive/writer.cc:83
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असकà¥à¤·à¤®\n"
+
+#: ftparchive/writer.cc:125
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:127
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:134
+msgid "E: Errors apply to file "
+msgstr "E: फाइलमा तà¥à¤°à¥à¤Ÿà¤¿à¤¹à¤°à¥‚ लागू गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "%s हल गरà¥à¤¨ असफल भयो"
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "टà¥à¤°à¥€ हिडाईठअसफल भयो"
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s खोलà¥à¤¨ असफल"
+
+#: ftparchive/writer.cc:245
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "लिङà¥à¤• पढà¥à¤¨ असफल %s"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "अनलिङà¥à¤• गरà¥à¤¨ असफल %s"
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s मा %s लिङà¥à¤• असफल भयो"
+
+#: ftparchive/writer.cc:274
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "यस %sB हिटको डि लिङà¥à¤• सिमा।\n"
+
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
+#, c-format
+msgid "Failed to stat %s"
+msgstr " %s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "संगà¥à¤°à¤¹ संग कà¥à¤¨à¥ˆ पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाà¤à¤Ÿ छैन"
+
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s संग कà¥à¤¨à¥ˆ अधिलेखन पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿ छैन\n"
+
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " %s संभारकरà¥à¤¤à¤¾ %s हो %s होइन\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "आनà¥à¤¤à¤°à¥€à¤• तà¥à¤°à¥à¤Ÿà¤¿, सदसà¥à¤¯ तोकà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - सà¥à¤®à¥ƒà¤¤à¤¿ बाà¤à¤¡à¤«à¤¾à¤à¤¡ गरà¥à¤¨ असफल भयो"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s खोलà¥à¤¨ असफल"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "वैरà¥à¤ªà¥à¤¯ गरिà¤à¤•à¥‹ अधिलेखन %s रेखा %lu #१"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "वैरà¥à¤ªà¥à¤¯ गरिà¤à¤•à¥‹ अधिलेखन %s रेखा %lu #२"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "वैरà¥à¤ªà¥à¤¯ गरिà¤à¤•à¥‹ अधिलेखन %s रेखा %lu #३"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "अधिलेखन फाइल पढà¥à¤¨ असफल %s"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "अजà¥à¤žà¤¾à¤¤ सङà¥à¤•à¥à¤šà¤¨ अलà¥à¤—ोरिदà¥à¤® '%s'"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "सङà¥à¤•à¥à¤šà¤¨ गरिà¤à¤•à¥‹ निरà¥à¤—ात %s लाई सङà¥à¤•à¥à¤šà¤¨ सेटको आवशà¥à¤¯à¤•à¥à¤¤à¤¾ परà¥à¤¦à¤›"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾à¤®à¤¾ IPC पाइप सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "FILE* सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "काà¤à¤Ÿà¤¾ गरà¥à¤¨ असफल"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "सङà¥à¤•à¥à¤šà¤¨ शाखा"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "आनà¥à¤¤à¤°à¥€à¤• तà¥à¤°à¥à¤Ÿà¤¿, %s सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ IPC सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "सङà¥à¤•à¥à¤šà¤¨à¤•à¤°à¥à¤¤à¤¾ कारà¥à¤¯à¤¾à¤¨à¥à¤µà¤¯à¤¨ गरà¥à¤¨ असफल भयो"
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "सङà¥à¤•à¥à¤šà¤¨à¤µà¤¿à¤¹à¤¿à¤¨ करà¥à¤¤à¤¾"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾/फाइलमा IO असफल भयो"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "MD5 गणना गरà¥à¤¦à¤¾ पढà¥à¤¨ असफल भयो"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "समसà¥à¤¯à¤¾ अनलिङà¥à¤• भइरहेछ %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr " %s मा %s पà¥à¤¨:नामकरण असफल भयो"
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "संकलन तà¥à¤°à¥à¤Ÿà¤¿ रिजेकà¥à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - %s"
+
+#: cmdline/apt-get.cc:237
+msgid "The following packages have unmet dependencies:"
+msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤²à¥‡ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ भेटेननà¥:"
+
+#: cmdline/apt-get.cc:327
+#, c-format
+msgid "but %s is installed"
+msgstr "तर %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो"
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "तर %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥à¤ªà¤°à¥à¤¯à¥‹"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾à¤¯à¥‹à¤—à¥à¤¯ छैन"
+
+#: cmdline/apt-get.cc:338
+msgid "but it is a virtual package"
+msgstr "तर यो अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œ होइन"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not installed"
+msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨ गइरहेको छैन"
+
+#: cmdline/apt-get.cc:346
+msgid " or"
+msgstr "वा"
+
+#: cmdline/apt-get.cc:375
+msgid "The following NEW packages will be installed:"
+msgstr "निमà¥à¤¨ नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटाइनेछनà¥:"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ पछाडि राखिनेछनà¥:"
+
+#: cmdline/apt-get.cc:444
+msgid "The following packages will be upgraded:"
+msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¤à¤° वृदà¥à¤§à¤¿ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
+
+#: cmdline/apt-get.cc:465
+msgid "The following packages will be DOWNGRADED:"
+msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¤à¤°à¤•à¤® गरिनेछनà¥:"
+
+#: cmdline/apt-get.cc:485
+msgid "The following held packages will be changed:"
+msgstr "निमà¥à¤¨ भइरहेको पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ परिवरà¥à¤¤à¤¨ हà¥à¤¨à¥‡à¤›à¥ˆà¤¨:"
+
+#: cmdline/apt-get.cc:538
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s कारणले) "
+
+#: cmdline/apt-get.cc:546
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"चेतावनी: निमà¥à¤¨ आवशà¥à¤¯à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटाइनेछनॠ।\n"
+"तपाईठके गरिरहेको यकिन नभà¤à¤¸à¤®à¥à¤® यो काम गरिने छैन!"
+
+#: cmdline/apt-get.cc:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गरियो, %lu नयाठसà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो, "
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पà¥à¤¨: सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरियो, "
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu सà¥à¤¤à¤° कम गरियो, "
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu हटाउन र %lu सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गरिà¤à¤¨ ।\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu पूरà¥à¤£à¤°à¥à¤ªà¤²à¥‡ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨ र हटाइà¤à¤¨ ।\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤° गरिदैछ..."
+
+#: cmdline/apt-get.cc:652
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: cmdline/apt-get.cc:655
+msgid "Unable to correct dependencies"
+msgstr "निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤° गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: cmdline/apt-get.cc:658
+msgid "Unable to minimize the upgrade set"
+msgstr "सà¥à¤¤à¤° वृदà¥à¤§à¤¿ सेटलाई नà¥à¤¯à¥‚नतम गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: cmdline/apt-get.cc:660
+msgid " Done"
+msgstr "काम भयो"
+
+#: cmdline/apt-get.cc:664
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "यी सà¥à¤§à¤¾à¤° गरà¥à¤¨ तपाईà¤à¤²à¥‡ `apt-get -f install' चलाउन परà¥à¤› ।"
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr "नभेटिà¤à¤•à¤¾ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । -f पà¥à¤°à¤¯à¥‹à¤— गरेर पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "चेतावनी: निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¤²à¥‡à¤œà¤¹à¤°à¥‚ पà¥à¤°à¤£à¤¾à¤£à¥€à¤•à¤°à¤£ हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨! "
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "पà¥à¤°à¤®à¤¾à¤£à¤¿à¤•à¤°à¤£ चेतावनी अधिलेखन भयो ।\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "यी पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ रूजू बिना सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› [y/N]? "
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "केही पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ पà¥à¤°à¤®à¤¾à¤£à¥€à¤•à¤°à¤£ हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "तà¥à¤¯à¤¹à¤¾à¤ समसà¥à¤¯à¤¾à¤¹à¤°à¥‚ छनॠर हà¥à¤¨à¥à¤›à¤²à¤¾à¤ˆ जोड नगरिकन -y को पà¥à¤°à¤¯à¥‹à¤— भयो"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿, सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤²à¤¾à¤ˆ भाà¤à¤šà¤¿à¤à¤•à¥‹ पà¥à¤¯à¤¾à¤•à¥‡à¤œ भनिनà¥à¤¥à¥à¤¯à¥‹!"
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटà¥à¤¨ चाहदैछनॠतर हटाई अकà¥à¤·à¤® भइरहेछ ।"
+
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿, आदेश समापà¥à¤¤ भà¤à¤•à¥‹ छैन"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+msgid "Unable to lock the download directory"
+msgstr "डाउनलोड डाइरेकà¥à¤Ÿà¥à¤°à¥€ तालà¥à¤šà¤¾ मारà¥à¤¨ असकà¥à¤·à¤®"
+
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "सà¥à¤°à¥‹à¤¤à¤¹à¤°à¥à¤•à¥‹ सूचि पढà¥à¤¨ सकिà¤à¤¨ ।"
+
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "कसà¥à¤¤à¥‹ नमिलेको.. साइजहरू मेल खाà¤à¤¨, apt@packages.debian.org इमेल गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB/%sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• ।\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• ।\n"
+
+#: cmdline/apt-get.cc:829
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "अनपà¥à¤¯à¤¾à¤• गरिसके पछि थप डिसà¥à¤• खाली ठाउà¤à¤•à¥‹ %sB पà¥à¤°à¤¯à¥‹à¤— हà¥à¤¨à¥‡à¤› ।\n"
+
+#: cmdline/apt-get.cc:832
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "%sB अनपà¥à¤¯à¤¾à¤• गरिसके पछि डिसà¥à¤• खाली ठाउठखाली हà¥à¤¨à¥‡à¤› ।\n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr " %s मा खाली ठाऊठनिरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ सकिà¤à¤¨"
+
+#: cmdline/apt-get.cc:849
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "तपाईठसंग %s मा परà¥à¤¯à¤¾à¤ªà¥à¤¤ खाली ठाऊठछैन ।"
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "तà¥à¤°à¤¿à¤­à¤¿à¤¯à¤² मातà¥à¤° निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरिà¤à¤•à¥‹ छ तर यो तà¥à¤°à¤¿à¤­à¤¿à¤¯à¤² सञà¥à¤šà¤¾à¤²à¤¨ होइन ।"
+
+#: cmdline/apt-get.cc:866
+msgid "Yes, do as I say!"
+msgstr "हो,मैले भने जसà¥à¤¤à¥ˆ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥!"
+
+#: cmdline/apt-get.cc:868
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"तपाईà¤à¤²à¥‡ केही संभवत: हानिकारक काम गरà¥à¤¨à¥à¤ªà¤°à¥à¤› ।\n"
+"निरनà¥à¤¤à¤°à¤¤à¤¾ दिन '%s' वाकà¥à¤¯à¤¾à¤‚शमा टाइप गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ \n"
+" ?] "
+
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+msgid "Abort."
+msgstr "परितà¥à¤¯à¤¾à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: cmdline/apt-get.cc:889
+msgid "Do you want to continue [Y/n]? "
+msgstr "के तपाईठनिरनà¥à¤¤à¤°à¤¤à¤¾ दिन चाहनà¥à¤¹à¥à¤¨à¥à¤› [Y/n]? "
+
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "%s %s तानà¥à¤¨ असफल भयो\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "केही फाइलहरू डाउनलोड गरà¥à¤¨ असफल भयो"
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+msgid "Download complete and in download only mode"
+msgstr "डाउनलोड समापà¥à¤¤ भयो र डाउनलोडमा मोड मातà¥à¤°à¥ˆ छ"
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"केही संगà¥à¤°à¤¹à¤¹à¤°à¥‚ तानà¥à¤¨ असकà¥à¤·à¤® भयो,apt-get अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• चलिरहेछ वा हराइरहेको --fix-संगै पà¥à¤°à¤¯à¤¾à¤¸ "
+"गरà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?"
+
+#: cmdline/apt-get.cc:990
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "हराइरहेको --fix-र सà¥à¤µà¤¾à¤ª भइरहेको मेडिया हाल समरà¥à¤¥à¤¿à¤¤ भइरहेको छैन"
+
+#: cmdline/apt-get.cc:995
+msgid "Unable to correct missing packages."
+msgstr "हराइरहेको पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤°à¥à¤¨ असकà¥à¤·à¤® भयो ।"
+
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."
+msgstr "सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ परितà¥à¤¯à¤¾à¤— गरिदैछ ।"
+
+#: cmdline/apt-get.cc:1030
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "दà¥à¤°à¤·à¥à¤Ÿà¤¬à¥à¤¯, %s को सटà¥à¤Ÿà¤¾ %s चयन भइरहेछ\n"
+
+#: cmdline/apt-get.cc:1040
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s फडà¥à¤•à¤¿à¤¦à¥ˆà¤›, यो पहिलà¥à¤¯à¥ˆ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो र सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿ सेट भà¤à¤•à¥‹ छैन ।\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨, तà¥à¤¯à¤¸à¥ˆà¤²à¥‡ हटेन\n"
+
+#: cmdline/apt-get.cc:1069
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s ...दà¥à¤µà¤¾à¤°à¤¾ उपलबà¥à¤§ गराइà¤à¤•à¥‹ अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œ हो:\n"
+
+#: cmdline/apt-get.cc:1081
+msgid " [Installed]"
+msgstr " [सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो]"
+
+#: cmdline/apt-get.cc:1086
+msgid "You should explicitly select one to install."
+msgstr "तपाईà¤à¤²à¥‡ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨ सà¥à¤ªà¤·à¥à¤Ÿ रà¥à¤ªà¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: cmdline/apt-get.cc:1091
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s उपलबà¥à¤§ छैन, तर अरà¥à¤•à¥‹ पà¥à¤¯à¤¾à¤•à¥‡à¤œ दà¥à¤µà¤¾à¤°à¤¾ सिफारिस पà¥à¤¯à¤¾à¤•à¥‡à¤œ हो ।\n"
+"यसको मतलब पà¥à¤¯à¤¾à¤•à¥‡à¤œ हराइरहेको पà¥à¤¯à¤¾à¤•à¥‡à¤œ, बेकायम भयो\n"
+" अरà¥à¤•à¥‹ सà¥à¤°à¥‹à¤¤à¤¬à¤¾à¤Ÿ मातà¥à¤° उपलबà¥à¤§ हà¥à¤¨à¥à¤›\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "जे भठपनि निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ले यसलाई बदलà¥à¤›:"
+
+#: cmdline/apt-get.cc:1113
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s संग कà¥à¤¨à¥ˆ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ उमेदà¥à¤µà¤¾à¤° छैन"
+
+#: cmdline/apt-get.cc:1133
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr " %s को पà¥à¤¨: सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ समà¥à¤­à¤µ छैन, यो डाउनलोड हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ ।\n"
+
+#: cmdline/apt-get.cc:1141
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s पहिलà¥à¤¯à¥ˆ नयाठसंसà¥à¤•à¤°à¤£ हो ।\n"
+
+#: cmdline/apt-get.cc:1168
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' निषà¥à¤•à¤¾à¤¶à¤¨ फेला पारà¥à¤¨ सकिà¤à¤¨"
+
+#: cmdline/apt-get.cc:1170
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr " '%s' को लागि '%s' संसà¥à¤•à¤°à¤£ फेला पारà¥à¤¨ सकिà¤à¤¨"
+
+#: cmdline/apt-get.cc:1176
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "%s को लागि चयन भà¤à¤•à¥‹ संसà¥à¤•à¤°à¤£ %s (%s)\n"
+
+#: cmdline/apt-get.cc:1313
+msgid "The update command takes no arguments"
+msgstr "अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• आदेशले कà¥à¤¨à¥ˆ तरà¥à¤•à¤¹à¤°à¥‚ लिदैन"
+
+#: cmdline/apt-get.cc:1326
+msgid "Unable to lock the list directory"
+msgstr "सूचि डाइरेकà¥à¤Ÿà¥à¤°à¥€ तालà¥à¤šà¤¾ मारà¥à¤¨ असफल"
+
+#: cmdline/apt-get.cc:1384
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"केही अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरू डाउनलोड गरà¥à¤¨ असफल भयो, तिनीहरू उपेकà¥à¤·à¤¿à¤¤ भà¤, वा सटà¥à¤Ÿà¤¾à¤®à¤¾ पà¥à¤°à¤¾à¤¨à¥‹ "
+"à¤à¤‰à¤Ÿà¤¾ पà¥à¤°à¤¯à¥‹à¤— गरियो ।"
+
+#: cmdline/apt-get.cc:1403
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿,सबै सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿à¤²à¥‡ उतà¥à¤¤à¤® गà¥à¤£ नषà¥à¤Ÿ गरà¥à¤¦à¤›"
+
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ सकिà¤à¤¨ %s"
+
+#: cmdline/apt-get.cc:1516
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "दà¥à¤°à¤·à¥à¤Ÿà¤¬à¥à¤¯, रिजेकà¥à¤¸ '%s' को लागि %s चयन गरिदैछ\n"
+
+#: cmdline/apt-get.cc:1546
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "तपाईठयसलाई सà¥à¤§à¤¾à¤° गरà¥à¤¨ `apt-get -f install' चलाउन चाहनà¥à¤¹à¥à¤¨à¥à¤›:"
+
+#: cmdline/apt-get.cc:1549
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"नभेटिà¤à¤•à¤¾ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ बिना 'apt-get -f install' पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ( वा "
+"समाधान निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥) ।"
+
+#: cmdline/apt-get.cc:1561
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"केही पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ । यसको मतलब तपाईà¤à¤²à¥‡\n"
+" à¤à¤‰à¤Ÿà¤¾ असमà¥à¤­à¤µ अवासà¥à¤¥à¤¾à¤•à¥‹ अनà¥à¤°à¥‹à¤§ गरà¥à¤¨à¥ भà¤à¤•à¥‹ छ वा यदि तपाईà¤à¤²à¥‡ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥ भइरहेको केहि "
+"पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ आवशà¥à¤¯à¤•à¤¤à¤¾ परà¥à¤¨à¥‡ असà¥à¤¥à¤¿à¤°\n"
+" वितरण अहिले समà¥à¤® सिरà¥à¤œà¤¨à¤¾\n"
+" भà¤à¤•à¥‹ छैन वा आवगमन विनानै सरà¥à¤¯à¥‹ ।"
+
+#: cmdline/apt-get.cc:1569
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"तपाईà¤à¤²à¥‡ à¤à¤•à¤² सञà¥à¤šà¤¾à¤²à¤¨ मातà¥à¤° अनà¥à¤°à¥‹à¤§ गरे पछि\n"
+" यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ साधरण तरिकाले नितानà¥à¤¤ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾à¤¯à¥‹à¤—à¥à¤¯ देखिदैन र तà¥à¤¯à¥‹ पà¥à¤¯à¤¾à¤•à¥‡à¤œ विरà¥à¤¦à¥à¤§à¤•à¥‹\n"
+" बग पà¥à¤°à¤¤à¤¿à¤µà¥‡à¤¦à¤¨ भरिनेछ ।"
+
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr "निमà¥à¤¨ सूचनाले अवसà¥à¤¥à¤¾à¤²à¤¾à¤ˆ हल गरà¥à¤¨ मदà¥à¤¦à¤¤ गरà¥à¤¨à¥‡à¤›: "
+
+#: cmdline/apt-get.cc:1577
+msgid "Broken packages"
+msgstr "भाà¤à¤šà¤¿à¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚"
+
+#: cmdline/apt-get.cc:1603
+msgid "The following extra packages will be installed:"
+msgstr "निमà¥à¤¨ अतिरिकà¥à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
+
+#: cmdline/apt-get.cc:1674
+msgid "Suggested packages:"
+msgstr "सà¥à¤à¤¾à¤µ दिà¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-get.cc:1675
+msgid "Recommended packages:"
+msgstr "सिफारिस गरिà¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
+
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "
+msgstr "सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गणना गरिदैछ..."
+
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "असफल भयो"
+
+#: cmdline/apt-get.cc:1703
+msgid "Done"
+msgstr "काम भयो"
+
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿,समसà¥à¤¯à¤¾ हलकरà¥à¤¤à¤¾à¤²à¥‡ उतà¥à¤¤à¤® गà¥à¤£ भाà¤à¤šà¥à¤¯à¥‹ "
+
+#: cmdline/apt-get.cc:1876
+msgid "Must specify at least one package to fetch source for"
+msgstr "को लागि सà¥à¤°à¥‹à¤¤ तानà¥à¤¨ कमà¥à¤¤à¤¿à¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤ªà¤°à¥à¤›"
+
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "%s को लागि सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ असफल भयो"
+
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "पहिलà¥à¤¯à¥ˆ डाउनलोड भà¤à¤•à¤¾ फाइलहरॠफडà¥à¤•à¤¾à¤‡à¤¦à¥ˆà¤› '%s'\n"
+
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "तपाईठसंग %s मा परà¥à¤¯à¤¾à¤ªà¥à¤¤ खाली ठाऊठछैन"
+
+#: cmdline/apt-get.cc:1979
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "सà¥à¤°à¥‹à¤¤ संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB/%sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• छ ।\n"
+
+#: cmdline/apt-get.cc:1982
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "सà¥à¤°à¥‹à¤¤ संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• छ ।\n"
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "सà¥à¤°à¥‹à¤¤ फडà¥à¤•à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ %s\n"
+
+#: cmdline/apt-get.cc:2019
+msgid "Failed to fetch some archives."
+msgstr "केही संगà¥à¤°à¤¹ फडà¥à¤•à¤¾à¤‰à¤¨ असफल भयो ।"
+
+#: cmdline/apt-get.cc:2047
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr " %s मा पहिलà¥à¤¯à¥ˆ अनपà¥à¤¯à¤¾à¤• गरिà¤à¤•à¤¾ सà¥à¤°à¥‹à¤¤à¤•à¥‹ अनपà¥à¤¯à¤¾à¤• फडà¥à¤•à¤¾à¤‡à¤¦à¥ˆà¤›\n"
+
+#: cmdline/apt-get.cc:2059
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "अनपà¥à¤¯à¤¾à¤• आदेश '%s' असफल भयो ।\n"
+
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "जाà¤à¤šà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ यदि 'dpkg-dev' पà¥à¤¯à¤¾à¤•à¥‡à¤œ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो ।\n"
+
+#: cmdline/apt-get.cc:2077
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "निरà¥à¤®à¤¾à¤£ आदेश '%s' असफल भयो ।\n"
+
+#: cmdline/apt-get.cc:2096
+msgid "Child process failed"
+msgstr "शाखा पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ असफल भयो"
+
+#: cmdline/apt-get.cc:2112
+msgid "Must specify at least one package to check builddeps for"
+msgstr "को लागि builddeps जाà¤à¤šà¥à¤¨ कमà¥à¤¤à¤¿à¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ निरà¥à¤¦à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤ªà¤°à¥à¤›"
+
+#: cmdline/apt-get.cc:2140
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "%s को लागि निरà¥à¤®à¤¾à¤£-निरà¥à¤­à¤°à¤¤à¤¾ सूचना पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: cmdline/apt-get.cc:2160
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s कà¥à¤¨à¥ˆ निरà¥à¤®à¤¾à¤£à¤®à¤¾ आधारित हà¥à¤¦à¥ˆà¤¨ ।\n"
+
+#: cmdline/apt-get.cc:2212
+#, 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:2264
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"%sको लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ हà¥à¤¨ सकेन किन भने पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s को कà¥à¤¨à¥ˆ उपलबà¥à¤§ संसà¥à¤•à¤°à¤£à¤²à¥‡ संसà¥à¤•à¤°à¤£ "
+"आवशà¥à¤¯à¤•à¤¤à¤¾à¤¹à¤°à¥à¤²à¤¾à¤ˆ सनà¥à¤¤à¥à¤·à¥à¤Ÿ पारà¥à¤¨ सकेन "
+
+#: cmdline/apt-get.cc:2299
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "%s को लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ पारà¥à¤¨ असफल भयो: सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s अति नयाठछ"
+
+#: cmdline/apt-get.cc:2324
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s को लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ गरà¥à¤¨ असफल: %s"
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s को लागि निरà¥à¤®à¤¾à¤£ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ सनà¥à¤¤à¥à¤·à¥à¤Ÿ गरà¥à¤¨ सकिà¤à¤¨ । "
+
+#: cmdline/apt-get.cc:2342
+msgid "Failed to process build dependencies"
+msgstr "निरà¥à¤®à¤¾à¤£ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¨ असफल"
+
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"
+msgstr "समरà¥à¤¥à¤¿à¤¤ मोडà¥à¤¯à¥à¤²à¤¹à¤°à¥‚:"
+
+#: cmdline/apt-get.cc:2415
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"उपयोग: apt-get [विकलà¥à¤ªà¤¹à¤°à¥‚] आदेश\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get डाउनलोड गरà¥à¤¨ र पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨à¤•à¥‹ लागि साधारण आदेश लाइन इनà¥à¤Ÿà¤°à¤«à¥‡à¤¸ हो ।\n"
+"बारमà¥à¤¬à¤¾à¤° पà¥à¤°à¤¯à¥‹à¤— भइरहने आदेशहरू अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• र सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥ ।\n"
+"\n"
+"\n"
+"आदेशहरू:\n"
+" अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ नयाठसूचिहरू पà¥à¤¨:पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - à¤à¤‰à¤Ÿà¤¾ सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿ समà¥à¤ªà¤¾à¤¦à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ (pkg libc6 हो libc6.deb होइन)\n"
+" हटाउनà¥à¤¹à¥‹à¤¸à¥ - पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" सà¥à¤°à¥‹à¤¤ - सà¥à¤°à¥‹à¤¤ संगà¥à¤°à¤¹à¤¹à¤°à¥‚ डाउनलोड गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" build-dep - सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ लागि निरà¥à¤®à¤¾à¤£-निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ कनफिगर गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" dist-upgrade - सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿ वितरण गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, apt-get(8) हेरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" dselect-upgrade - dselect चयनहरू पछà¥à¤¯à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" सफा गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - डाउनलोड गरिà¤à¤•à¥‹ संगà¥à¤°à¤¹ फाइलहरू मेटà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ सफा - पà¥à¤°à¤¾à¤¨à¥‹ डाउनलोड भà¤à¤•à¥‹ संगà¥à¤°à¤¹ पाइलहरू मेटà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" जाà¤à¤šà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - तà¥à¤¯à¤¹à¤¾à¤ कà¥à¤¨à¥ˆ भाà¤à¤šà¤¿à¤à¤•à¤¾ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ छैन भनà¥à¤¨à¥‡ रूजू गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ.\n"
+" -q लगयोगà¥à¤¯ निरà¥à¤—ात - कà¥à¤¨à¥ˆ पà¥à¤°à¤—ति सूचि छैन\n"
+" -qq तà¥à¤°à¥à¤Ÿà¤¿à¤¹à¤°à¥à¤•à¥‹ लागि निरà¥à¤—ात बाहेक केही छैन\n"
+" -d डाउनलोड मातà¥à¤° - संगà¥à¤°à¤¹à¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ वा अनपà¥à¤¯à¤¾à¤• नगरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -s No-act. Perform ordering simulation\n"
+" -y सबै कà¥à¤µà¥‡à¤°à¥€à¤¹à¤°à¥à¤²à¤¾à¤ˆ हो मानà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ र दूषित नबनाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" -f यदि पूरà¥à¤£à¤°à¥à¤ªà¤²à¥‡ जाà¤à¤š असफल भयो भने निरनà¥à¤¤à¤°à¤¤à¤¾ दिने पà¥à¤°à¤¯à¤¤à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -m यदि संगà¥à¤°à¤¹à¤¹à¤°à¥ सà¥à¤¥à¤¾à¤¨à¤¿à¤¯à¤•à¤°à¤£ योगà¥à¤¯ छैन भने निरनà¥à¤¤à¤°à¤¤à¤¾ दिने पà¥à¤°à¤¯à¤¤à¥à¤¨ दिनà¥à¤¹à¥‹à¤¸à¥\n"
+" -u सà¥à¤¤à¤° वृदà¥à¤§à¤¿ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ सूचि रामà¥à¤°à¥‹ संग देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" -b यसलाई तानिसके पछि सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ निरà¥à¤®à¤¾à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -V भरबोस संसà¥à¤•à¤°à¤£ नमà¥à¤¬à¤°à¤¹à¤°à¥‚ देखाउनà¥à¤¹à¥‹à¤¸à¥\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन विकलà¥à¤ª सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ -o dir::cache=/tmp\n"
+"धेरै सूचना र विकलà¥à¤ªà¤•à¥‹ लागि apt-get(8), sources.list(5) र apt.conf(5) manual\n"
+"pages हेरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+" APT संग सà¥à¤ªà¤° काउ शकà¥à¤¤à¤¿à¤¹à¤°à¥‚ छ ।\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "हानà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Ign "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Err "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "%s (%sB/s) मा %sB मा तानियो\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [काम गरिरहेको]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"मेडिया परिवरà¥à¤¤à¤¨: कृपया डिसà¥à¤• लेबà¥à¤² डà¥à¤°à¤¾à¤‡à¤­ '%s' मा घà¥à¤¸à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" '%s'\n"
+"र इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "अजà¥à¤žà¤¾à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ रेकरà¥à¤¡!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइलहरू कà¥à¤°à¤®à¤¬à¤¦à¥à¤§ गरà¥à¤¨à¥‡ साधारण उपकरण हो । -s विकलà¥à¤ª कसà¥à¤¤à¥‹ खालको "
+"फाइल हो भनी इंकित गरà¥à¤¨ पà¥à¤°à¤¯à¥‹à¤— गरिनà¥à¤› ।\n"
+"\n"
+"विकलà¥à¤ªà¤¹à¤°à¥‚:\n"
+" -h यो मदà¥à¤¦à¤¤ पाठ\n"
+" -s कà¥à¤°à¤®à¤¬à¤¦à¥à¤§ सà¥à¤°à¥‹à¤¤ फाइल पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -c=? यो कनफिगरेसन फाइल पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥\n"
+" -o=? à¤à¤‰à¤Ÿà¤¾ सà¥à¤µà¥‡à¤šà¥à¤›à¤¾à¤šà¤¾à¤°à¥€ कनफिगरेसन विकलà¥à¤ª सेट गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, जसà¥à¤¤à¥ˆ -o dir::cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "खराब पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£ सेटिङà¥à¤—!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "निरनà¥à¤¤à¤°à¤¤à¤¾ दिन इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "अनपà¥à¤¯à¤¾à¤• गरà¥à¤¦à¤¾ केही तà¥à¤°à¥à¤Ÿà¤¿à¤¹à¤°à¥‚ देखा परà¥à¤¯à¥‹ । म कनफिगर गरà¥à¤¨ गइरहेको छà¥"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤•à¥‹ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ । यसले नकà¥à¤•à¤²à¥€ तà¥à¤°à¥à¤Ÿà¤¿à¤¹à¤°à¥à¤®à¤¾ नतिजा गरà¥à¤¨ सकà¥à¤›"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "वा तà¥à¤°à¥à¤Ÿà¤¿ हरटाइरहेको निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥à¤²à¥‡ गरेको हो । यो ठीक छ, मातà¥à¤° तà¥à¤°à¥à¤Ÿà¤¿à¤¹à¤°à¥‚"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"दिà¤à¤•à¥‹ संदेशहरू महतà¥à¤µà¤ªà¥‚रà¥à¤£ छ । कृपया तिनीहरू निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ र चलाउनà¥à¤¹à¥‹à¤¸à¥ [I]फेरी सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ "
+"गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "उपलबà¥à¤§ सूचना गाà¤à¤­à¤¿à¤¦à¥ˆà¤›"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "पाइपहरू सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "gzip कारà¥à¤¯à¤¨à¥à¤µà¤¯à¤¨ गरà¥à¤¨ असफल"
+
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+msgid "Corrupted archive"
+msgstr "संगà¥à¤°à¤¹ दूषित भयो"
+
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार चेकसम असफल भयो, संगà¥à¤°à¤¹ दूषित भयो"
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अजà¥à¤žà¤¾à¤¤ टार हेडर पà¥à¤°à¤•à¤¾à¤° %u, सदसà¥à¤¯ %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "अवैध संगà¥à¤°à¤¹ हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "संगà¥à¤°à¤¹ सदसà¥à¤¯ हेडर पढà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ "
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "अवैध संगà¥à¤°à¤¹ सदसà¥à¤¯ हेडर"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "संगà¥à¤°à¤¹ अति छोटो छ"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "संगà¥à¤°à¤¹ हेडरहरू पढà¥à¤¨ असफल"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "अहिलेसमà¥à¤® लिङà¥à¤• गरिà¤à¤•à¥‹ नोडमा बोलाइà¤à¤•à¥‹ डà¥à¤°à¤ªà¤¨à¥‹à¤¡"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "हà¥à¤¯à¤¾à¤¸ ततà¥à¤µ तोकà¥à¤¨ असफल भयो"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "मोड बाà¤à¤¡à¥à¤¨ असफल भयो"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "थपमोडमा आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "मोड अधिलेखन गरà¥à¤¨à¥‡ पà¥à¤¯à¤¾à¤¸ गरिदै, %s -> %s र %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "मोडको डबल थप %s -> %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "नकà¥à¤•à¤²à¥€ कनफिगगरेसन फाइल %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "फाइल %s लेखà¥à¤¨ असफल भयो"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "%s फाइल बनà¥à¤¦ गरà¥à¤¨ असफल भयो"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "बाटो %s अति लामो छ "
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "à¤à¤• भनà¥à¤¦à¤¾ बढी %s अनपà¥à¤¯à¤¾à¤• गरिदैछ"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s फेरियो "
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ लकà¥à¤·à¤¿à¤¤ मोडमा लेखà¥à¤¨à¥‡ पà¥à¤¯à¤¾à¤¸ गरà¥à¤¦à¥ˆà¤› %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "घà¥à¤®à¥à¤¤à¥€ बाटो अति लामो छ"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s डाइरेकà¥à¤Ÿà¥à¤°à¥€ विहिन दà¥à¤µà¤¾à¤°à¤¾ बदलिदैछ"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "यसको हà¥à¤¯à¤¾à¤¸ बालà¥à¤Ÿà¥€à¤®à¤¾ नोड सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ असफल भयो"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "बाटो अति लामो छ"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr " %s को लागि संसà¥à¤•à¤°à¤¨ बिना अधिलेखन पà¥à¤¯à¤¾à¤•à¥‡à¤œ मेल खायो"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "फाइल %s/%s ले पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s मा à¤à¤‰à¤Ÿà¤¾ अधिलेखन गरà¥à¤¦à¤›"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "%s पढà¥à¤¨ असफल भयो"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "%s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "%s लाई फेरी सारà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "%s सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "%sinfo सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "सूचना र टेमà¥à¤ª डाइरेकà¥à¤Ÿà¥à¤°à¥€à¤¹à¤°à¥‚ à¤à¤‰à¤Ÿà¥ˆ फाइल पà¥à¤°à¤£à¤¾à¤²à¥€à¤®à¤¾ हà¥à¤¨à¤ªà¤°à¥à¤›"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ सूचिहरू पढिदैछ"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "पà¥à¤°à¤¶à¤¾à¤¸à¤¨à¤¿à¤• डाइरेकà¥à¤Ÿà¥à¤°à¥€ %sinfo मा परिवरà¥à¤¤à¤¨ गरà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ नाम पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¦à¤¾ आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "फाइल सूचि पढिदैछ"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"सूचि फाइल '%sinfo/%s' खोलà¥à¤¨ असफल भयो । यदि तपाईठयो फाइल पà¥à¤¨:भणà¥à¤¡à¤¾à¤°à¤£ गरà¥à¤¨à¥ सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤¨ "
+"भने यसलाई खाली गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ र तà¥à¤°à¥à¤¨à¥à¤¤à¥ˆ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ उही संसà¥à¤•à¤°à¤£ पà¥à¤¨-सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ !"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "सूचि फाइल %sinfo/%s पढà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "नोड पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¦à¤¾ आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "घà¥à¤®à¤¾à¤‰à¤°à¥‹ फाइल %sdiversions खोलà¥à¤¨ असफल भयो"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "घà¥à¤®à¤¾à¤‰à¤°à¥‹ फाइल दूषित भयो"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "घà¥à¤®à¤¾à¤‰à¤°à¥‹ फाइलमा अवैध लाइन:%s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿à¤²à¥‡ मोड थपिरहेछ"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "pkg कà¥à¤¯à¤¾à¤¸ पहिले सà¥à¤°à¥à¤µà¤¾à¤¤ हà¥à¤¨à¥à¤ªà¤°à¥à¤›"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ असफल भयो: हेडर, अफसेट %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "वसà¥à¤¤à¥ सà¥à¤¥à¤¿à¤¤à¤¿ फाइलमा खराब कनफिग फाइल । अफसेट %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "MD5 पद वरà¥à¤£à¤¨ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ । अफसेट %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "यो वैध DEB संगà¥à¤°à¤¹ होइन, '%s' सदसà¥à¤¯ हराइरहेछ"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "यो वैध DEB संगà¥à¤°à¤¹ होइन, यो संग '%s' वा '%s' सदसà¥à¤¯ छैन"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "%s मा परिवरà¥à¤¤à¤¨ गरà¥à¤¨ सकिदैन"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿, सदसà¥à¤¯ तोकà¥à¤¨ सकिदैन"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "वैध नियनà¥à¤¤à¥à¤°à¤£ फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨à¥ असफल भयो"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "पद वरà¥à¤£à¤¨ गरà¥à¤¨ नसकिने नियनà¥à¤¤à¥à¤°à¤£ फाइल"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "सिडी रोम डेटाबेस पढà¥à¤¨ असकà¥à¤·à¤® %s"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"कृपया APT ले यो सिडी रोमलाई चिनà¥à¤¨à¤•à¥‹ लागि apt-cdrom पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । apt-get "
+"अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• नयाठसिडी रोमहरू थपà¥à¤¨à¤•à¥‹ लागि पà¥à¤°à¤¯à¥‹à¤— गरिदैन"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "गलत सिडी रोम"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "%s मा सिडी रोम अनमाउनà¥à¤Ÿ गरà¥à¤¨ असकà¥à¤·à¤® भयो, यो अहिले पà¥à¤°à¤¯à¥‹à¤—मा हà¥à¤¨ सकà¥à¤› ।"
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "डिसà¥à¤• फेला परेन ।"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "फाइल फेला परेन "
+
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल भयो"
+
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "परिमारà¥à¤œà¤¨ समय सेट असफल भयो"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "अवैध URl, सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ URIS // संग सà¥à¤°à¥‚ हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "लगइन भइरहेछ"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "समान नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "सरà¥à¤­à¤°à¤²à¥‡ जडान असà¥à¤µà¥€à¤•à¤¾à¤° गरà¥à¤¯à¥‹ र भनà¥à¤¯à¥‹: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "पास असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"पà¥à¤°à¥‹à¤•à¥à¤¸à¥€ सरà¥à¤­à¤° निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरियो तर कà¥à¤¨à¥ˆ सà¥à¤•à¥à¤°à¤¿à¤«à¥à¤Ÿ लगइन भà¤à¤¨, Acquire::ftp::ProxyLogin "
+"खाली छ ।"
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "लगइन सà¥à¤•à¥à¤°à¤¿à¤«à¥à¤Ÿ आदेश '%s' असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "टाइप असफल भयो: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "जडान समय सकियो"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "सरà¥à¤­à¤°à¤²à¥‡ जडान बनà¥à¤¦ गरà¥à¤¯à¥‹"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "तà¥à¤°à¥à¤Ÿà¤¿ पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "à¤à¤‰à¤Ÿà¤¾ पà¥à¤°à¤¤à¤¿à¤•à¥à¤°à¤¿à¤¯à¤¾à¤²à¥‡ बफर अधिपà¥à¤°à¤µà¤¾à¤¹ गरà¥à¤¯à¥‹"
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "पà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¤² दूषित"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "तà¥à¤°à¥à¤Ÿà¤¿ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "à¤à¤‰à¤Ÿà¤¾ सकेट सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ सकेन"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "डेटा सकेट जडान गरà¥à¤¨ सकिà¤à¤¨, जडान समय सकियो"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "निसà¥à¤•à¥à¤°à¤¿à¤¯ सकेट जडान गरà¥à¤¨ सकिà¤à¤¨"
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo सà¥à¤¨à¥à¤¨à¥‡ सकेट पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "सकेट बाà¤à¤§à¥à¤¨ सकिà¤à¤¨"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "सकेटमा सà¥à¤¨à¥à¤¨ सकिà¤à¤¨"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "सकेट नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ सकिà¤à¤¨"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "पोरà¥à¤Ÿ आदेश पठाउन असकà¥à¤·à¤® भयो"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "अजà¥à¤žà¤¾à¤¤ ठेगाना परिवार %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "डेटा सकेटको जडान समय सकियो"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "जडान सà¥à¤µà¥€à¤•à¤¾à¤° गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "समसà¥à¤¯à¤¾ दà¥à¤°à¥à¤¤à¤¾à¤¨à¥à¤µà¥‡à¤·à¤£ फाइल"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "फाइल तानà¥à¤¨ असकà¥à¤·à¤® भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹ '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "डेटा सकेट समय सकियो"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "डेटा सà¥à¤¥à¤¾à¤¨à¥à¤¤à¤°à¤£ असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹ '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "कà¥à¤µà¥‡à¤°à¥€"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "आहà¥à¤µà¤¾à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "%s (%s) मा जडान गरिदैछ"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ सकिà¤à¤¨"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr " %s:%s (%s) मा जडान सà¥à¤°à¥à¤µà¤¾à¤¤ गरà¥à¤¨ सकेन"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "%s:%s (%s) मा जडान गरà¥à¤¨ सकिà¤à¤¨, जडान समय सकियो"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr " %s:%s (%s) मा जडान गरà¥à¤¨ सकिà¤à¤¨ ।"
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "%s मा जडान गरिदैछ"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "'%s' हल गरà¥à¤¨ सकिà¤à¤¨"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "'%s' हल गरà¥à¤¦à¤¾ असà¥à¤¥à¤¾à¤¯à¥€ असफल"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr " '%s:%s' (%i) हल गरà¥à¤¦à¤¾ केही दà¥à¤·à¥à¤Ÿ घटà¥à¤¯à¥‹"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "%s %s मा जडान गरà¥à¤¨ असफल भयो:"
+
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "कà¥à¤žà¥à¤œà¥€ घणà¥à¤Ÿà¥€ पहà¥à¤à¤š गरà¥à¤¨ सकिà¤à¤¨: '%s'"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "E: पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨à¥‡à¤¬à¤¾à¤Ÿ तरà¥à¤• सूचि::gpgv::अति लामो विकलà¥à¤ªà¤¹à¤°à¥‚ अवसà¥à¤¥à¤¿à¤¤ छ ।"
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿: असल हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°, तर कà¥à¤žà¥à¤œà¥€ औठाछाप निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ सकिà¤à¤¨?!"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "कमà¥à¤¤à¤¿à¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ अवैध हसà¥à¤¤à¤¾à¤•à¥à¤·à¤° विरोध भयो ।"
+
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "हसà¥à¤¤à¤¾à¤•à¥à¤·à¤° रूजू गरà¥à¤¨ '%s' कारà¥à¤¯à¤¨à¥à¤µà¤¯à¤¨ गरà¥à¤¨ सकिà¤à¤¨ (के gnupg सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो?)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "gpgv कारà¥à¤¯à¤¨à¥à¤µà¤¯à¤¨ गरà¥à¤¦à¤¾ अजà¥à¤žà¤¾à¤¤ तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "निमà¥à¤¨ हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°à¤¹à¤°à¥‚ अवैध छनà¥:\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "निमà¥à¤¨ हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°à¤¹à¤°à¥‚ रूजू हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ किन भने सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤žà¥à¤œà¥€ उपलबà¥à¤§ छैन:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "%s को लागि पाइप खोलà¥à¤¨ सकिà¤à¤¨"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "%s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ "
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "हेडरहरà¥à¤•à¥‹ लागि परà¥à¤–िदैछ"
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr " %u chars माथि à¤à¤•à¤² हेडर लाइन पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "खराब हेडर लाइन"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध जवाफ हेडर पठायो"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-लमà¥à¤¬à¤¾à¤ˆ हेडर पठायो"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-दायरा हेडर पठायो"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "HTTP सरà¥à¤­à¤° संग भाà¤à¤šà¤¿à¤à¤•à¥‹ दायरा समरà¥à¤¥à¤¨ छ"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "अजà¥à¤žà¤¾à¤¤ मिति ढाà¤à¤šà¤¾"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "असफल चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "जडान समय सकियो"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "निरà¥à¤—ात फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "सरà¥à¤­à¤°à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढिदैछ । दूर गनà¥à¤¤à¤¬à¥à¤¯ बनà¥à¤¦ जडान"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "सरà¥à¤­à¤°à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढिदैछ"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "खराब हेडर डेटा"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "जडान असफल भयो"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "à¤à¤‰à¤Ÿà¤¾ खाली फाइल mmap बनाउन सकिà¤à¤¨"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu बाइटहरà¥à¤•à¥‹ mmap बनाउन सकिà¤à¤¨"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पारà¥à¤¨ सकिà¤à¤¨"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "नचिनिà¤à¤•à¥‹ टाइप संकà¥à¤·à¤¿à¤ªà¥à¤¤ रà¥à¤ª: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "लाइन %d अति लामो छ (अधिकà¥à¤¤à¤® %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: बनà¥à¤¦ कà¥à¤¨à¥ˆ नाम बिना सà¥à¤°à¥‚ हà¥à¤¨à¥à¤› ।"
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: वैरà¥à¤ª गरिà¤à¤•à¥‹ टà¥à¤¯à¤¾à¤—"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: मान पछाडि अतिरिकà¥à¤¤ जंक"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: निरà¥à¤¦à¥‡à¤¶à¤¨à¤¹à¤°à¥‚ माथिलà¥à¤²à¥‹ तहबाट मातà¥à¤° हà¥à¤¨à¥à¤›"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: अति धेरै नेसà¥à¤Ÿà¥‡à¤¡ समावेश गरà¥à¤¦à¤›"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: यहाठबाट समावेश गरेको"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u: समरà¥à¤¥à¤¨ नभà¤à¤•à¥‹ डाइरेकà¥à¤Ÿà¤¿à¤­ '%s'"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "वाकà¥à¤¯ संरचना तà¥à¤°à¥à¤Ÿà¤¿ %s:%u:फाइलको अनà¥à¤¤à¥à¤¯à¤®à¤¾ अतिरिकà¥à¤¤ जंक"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... तà¥à¤°à¥à¤Ÿà¤¿!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... गरियो"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "आदेश लाइन विकलà¥à¤ª '%c' [%s बाट] जà¥à¤žà¤¾à¤¤ छैन ।"
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "आदेश लाइन विकलà¥à¤ª %s बà¥à¤à¤¿à¤à¤¨"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "आदेश लाइन विकलà¥à¤ª %s बूलियन छैन"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "विकलà¥à¤ª %s लाई à¤à¤‰à¤Ÿà¤¾ तरà¥à¤•à¤•à¥‹ आवशà¥à¤¯à¤•à¤¤à¤¾ परà¥à¤¦à¤› ।"
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "विकलà¥à¤ª %s: कनफिगरेसन वसà¥à¤¤à¥ विशिषà¥à¤Ÿà¤¿à¤•à¤°à¤£ संग à¤à¤‰à¤Ÿà¤¾ =<val> हà¥à¤¨à¥à¤ªà¤°à¥à¤› ।"
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "विकलà¥à¤ª %s लाई à¤à¤‰à¤Ÿà¤¾ इनà¥à¤Ÿà¤¿à¤œà¤° तरà¥à¤•à¤•à¥‹ आवशà¥à¤¯à¤• परà¥à¤¦à¤›, '%s' होइन"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "विकलà¥à¤ª '%s' अति लामो छ"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "अरà¥à¤¥ %s बà¥à¤à¤¿à¤à¤¨, सतà¥à¤¯ वा à¤à¥‚ठो पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "अवैध सञà¥à¤šà¤¾à¤²à¤¨ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "माउनà¥à¤Ÿ बिनà¥à¤¦à¥ %s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असकà¥à¤·à¤®"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "%s मा परिवरà¥à¤¤à¤¨ गरà¥à¤¨ असकà¥à¤·à¤®"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "सिडी रोम सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल भयो"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "तालà¥à¤šà¤¾ मारिà¤à¤•à¥‹ फाइल मातà¥à¤° पढà¥à¤¨à¤•à¥‹ लागि तालà¥à¤šà¤¾ मारà¥à¤¨ पà¥à¤°à¤¯à¥‹à¤— गरिà¤à¤•à¥‹ छैन %s"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "तालà¥à¤šà¤¾ मारिà¤à¤•à¥‹ फाइल खोलà¥à¤¨ सकिà¤à¤¨ %s"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "nfs माउनà¥à¤Ÿ गरिà¤à¤•à¥‹ लक फाइलको लागि लक पà¥à¤°à¤¯à¥‹à¤— गरिà¤à¤•à¥‹ छैन %s"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "तालà¥à¤šà¤¾ पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ सकिà¤à¤¨ %s"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr " %s को लागि परà¥à¤–िरहेको तर यो तà¥à¤¯à¤¹à¤¾à¤ छैन"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ %s ले खणà¥à¤¡à¤¿à¤•à¤°à¤£ गलà¥à¤¤à¤¿ पà¥à¤°à¤¾à¤ªà¥à¤¤ भयो ।"
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ %s ले à¤à¤‰à¤Ÿà¤¾ तà¥à¤°à¥à¤Ÿà¤¿ कोड फरà¥à¤•à¤¾à¤¯à¥‹ (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ %s अनपेकà¥à¤·à¤¿à¤¤ बनà¥à¤¦ भयो"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "फाइल %s खोलà¥à¤¨ सकिà¤à¤¨"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "पडà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, अहिले समà¥à¤® %lu पढà¥à¤¨ छ तर कà¥à¤¨à¥ˆ बाà¤à¤•à¥€ छैन"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, अहिले समà¥à¤® %lu लेखà¥à¤¨ छ तर सकिदैन "
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "फाइल बनà¥à¤¦ गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "फाइल अनलिङà¥à¤• गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "फाइल गà¥à¤ªà¥à¤¤à¤¿à¤•à¤°à¤£ गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "खाली पà¥à¤¯à¤¾à¤•à¥‡à¤œ कà¥à¤¯à¤¾à¤¸"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ कà¥à¤¯à¤¾à¤¸ फाइल दूषित भयो "
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ कà¥à¤¯à¤¾à¤¸ फाइल à¤à¤‰à¤Ÿà¤¾ अमिलà¥à¤¦à¥‹ संसà¥à¤•à¤°à¤£ हो"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "यो APT ले संसà¥à¤•à¤°à¤£ पà¥à¤°à¤£à¤¾à¤²à¥€à¤²à¤¾à¤ˆ समरà¥à¤¥à¤¨ गरà¥à¤¦à¥ˆà¤¨ '%s'"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ कà¥à¤¯à¤¾à¤¸ विभिनà¥à¤¨ वासà¥à¤¤à¥à¤•à¤²à¤¾à¤•à¥‹ लागि निरà¥à¤®à¤¾à¤£ भà¤à¤•à¥‹ हो"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "आधारित"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "पà¥à¤¨:आधारित"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "सà¥à¤à¤¾à¤µ दिनà¥à¤›"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "सिफारिस गरà¥à¤¦à¤›"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "दà¥à¤µà¤¨à¥à¤¦à¤¹à¤°à¥‚"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "बदलà¥à¤›"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "वेकायमहरू"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "महतà¥à¤µà¤ªà¥‚रà¥à¤£"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "आवशà¥à¤¯à¤•"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "मानक"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "वैकलà¥à¤ªà¤¿à¤•"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "अतिरिकà¥à¤¤"
+
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+msgid "Building dependency tree"
+msgstr "निरà¥à¤­à¤°à¤¤à¤¾ टà¥à¤°à¥€ निरà¥à¤®à¤¾à¤£ गरिदैछ"
+
+#: apt-pkg/depcache.cc:62
+msgid "Candidate versions"
+msgstr "उमेदà¥à¤µà¤¾à¤° संसà¥à¤•à¤°à¤£à¤¹à¤°à¥‚"
+
+#: apt-pkg/depcache.cc:91
+msgid "Dependency generation"
+msgstr "निरà¥à¤­à¤°à¤¤à¤¾ सिरà¥à¤œà¤¨à¤¾"
+
+#: apt-pkg/tagfile.cc:72
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल पद वरà¥à¤£à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® %s (१)"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल पद वरà¥à¤£à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® %s (२)"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %lu सà¥à¤°à¥‹à¤¤ सूचिमा %s (URI)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %lu सà¥à¤°à¥‹à¤¤ सूचिमा %s (dist)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %lu सà¥à¤°à¥‹à¤¤ सूचिमा %s (URI पद वरà¥à¤£à¤¨)"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %lu सà¥à¤°à¥‹à¤¤ सूचिमा %s (पूरà¥à¤£ dist)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %lu सà¥à¤°à¥‹à¤¤ सूचिमा %s (dist पद वरà¥à¤£à¤¨ )"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "%s खोलिदैछ"
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "लाइन %u सà¥à¤°à¥‹à¤¤ सूचि %s मा अति लामो छ ।"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %u सà¥à¤°à¥‹à¤¤ सूचिमा %s (पà¥à¤°à¤•à¤¾à¤°)"
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "सà¥à¤°à¥‹à¤¤ सूची %s भितà¥à¤° %u लाइनमा टाइप '%s' जà¥à¤žà¤¾à¤¤ छैन"
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %u सà¥à¤°à¥‹à¤¤ सूचिमा %s (बिकà¥à¤°à¤¤à¤¾ आइडी)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"दà¥à¤µà¤¨à¥à¤¦/पà¥à¤¨-आधारित लूपको कारणले गरà¥à¤¦à¤¾ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ चलाउनको लागि असà¥à¤¥à¤¾à¤¯à¥€ रà¥à¤ªà¤®à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s "
+"हटाउनॠपरà¥à¤¨à¥‡à¤› । यो पà¥à¤°à¤¾à¤¯ नरामà¥à¤°à¥‹ हो, तर यदि तपाईठयो साà¤à¤šà¥à¤šà¥ˆ गरà¥à¤¨ चाहनà¥à¤¹à¥à¤¨à¥à¤› भने, APT::"
+"Force-LoopBreak विकलà¥à¤ª सकà¥à¤°à¤¿à¤¯ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइल पà¥à¤°à¤•à¤¾à¤° '%s' समरà¥à¤¥à¤¿à¤¤ छैन"
+
+#: apt-pkg/algorithms.cc:241
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s पà¥à¤¨:सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨ चाहनà¥à¤›, तर यसको लागि मैले à¤à¤‰à¤Ÿà¤¾ संगà¥à¤°à¤¹ फेला पारà¥à¤¨ सकिन ।"
+
+#: apt-pkg/algorithms.cc:1059
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"तà¥à¤°à¥à¤Ÿà¤¿, pkgProblemResolver:: समाधानले विचà¥à¤›à¥‡à¤¦à¤¨ सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¦à¤›, यो भइरहेको पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤•à¥‹ "
+"कारणले गरà¥à¤¦à¤¾ हो ।"
+
+#: apt-pkg/algorithms.cc:1061
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "समसà¥à¤¯à¤¾à¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤°à¥à¤¨ असकà¥à¤·à¤® भयो, तपाईà¤à¤²à¥‡ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥ भाà¤à¤šà¥à¤¨à¥à¤­à¤¯à¥‹ ।"
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "आंशिक सूचिहरà¥à¤•à¥‹ डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s हराइरहेछ ।"
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "आंशिक संगà¥à¤°à¤¹ डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s हराइरहेछ ।"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li को %li फाइल पà¥à¤¨:पà¥à¤°à¤¾à¤ªà¥à¤¤ गरिदैछ (%s बाà¤à¤•à¥€ छ)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li को %li फाइल पà¥à¤¨:पà¥à¤°à¤¾à¤ªà¥à¤¤ गरिदैछ"
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "विधि डà¥à¤°à¤¾à¤‡à¤­à¤° %s फेला पारà¥à¤¨ सकिà¤à¤¨ ।"
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रà¥à¤ªà¤²à¥‡ सà¥à¤°à¥‚ हà¥à¤¨ सकेन"
+
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिसà¥à¤• लेबà¥à¤²: '%s' डà¥à¤°à¤¾à¤‡à¤­ '%s'मा घà¥à¤¸à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ र इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । "
+
+#: apt-pkg/init.cc:120
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "पà¥à¤¯à¤¾à¤•à¤¿à¤™à¥à¤— पà¥à¤°à¤£à¤¾à¤²à¥€ '%s' समरà¥à¤¥à¤¿à¤¤ छैन"
+
+#: apt-pkg/init.cc:136
+msgid "Unable to determine a suitable packaging system type"
+msgstr "उपयà¥à¤•à¥à¤¤ पà¥à¤¯à¤¾à¤•à¤¿à¤™à¥à¤— पà¥à¤°à¤£à¤¾à¤²à¥€ पà¥à¤°à¤•à¤¾à¤° निरà¥à¤§à¤¾à¤°à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असकà¥à¤·à¤® भयो ।"
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "तपाईà¤à¤•à¥‹ सà¥à¤°à¥‹à¤¤ सूचिमा केही 'source' URIs राखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ सूचीहरू वा वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ फाइल पद वरà¥à¤£à¤¨ गरà¥à¤¨ वा खोलà¥à¤¨ सकिà¤à¤¨ ।"
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "यो समसà¥à¤¯à¤¾à¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤°à¥à¤¨ तपाईठapt-get अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• चलाउन चाहनà¥à¤¹à¥à¤¨à¥à¤›"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾ फाइलमा अवैध रेकरà¥à¤¡, कà¥à¤¨à¥ˆ पà¥à¤¯à¤¾à¤•à¥‡à¤œ हेडर छैन"
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "पिन टाइप %s बà¥à¤à¥à¤¨ सकिà¤à¤¨ "
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "पिनको लागि कà¥à¤¨à¥ˆ पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•à¤¤à¤¾ (वा शूनà¥à¤¯) निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ छैन"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "कà¥à¤¯à¤¾à¤¸ संग à¤à¤‰à¤Ÿà¤¾ नमिलà¥à¤¦à¥‹ संसà¥à¤•à¤°à¤£ पà¥à¤°à¤£à¤¾à¤²à¥€ छ"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œ)"
+
+#: apt-pkg/pkgcachegen.cc:129
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (पà¥à¤¯à¤¾à¤•à¥‡à¤œ १ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥)"
+
+#: apt-pkg/pkgcachegen.cc:150
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (पà¥à¤¯à¤¾à¤•à¥‡à¤œ २ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥)"
+
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (नयाठफाइल संसà¥à¤•à¤°à¤£ १)"
+
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (नयाठसंसà¥à¤•à¤°à¤£ १)"
+
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (पà¥à¤¯à¤¾à¤•à¥‡à¤œ ३ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥)"
+
+#: apt-pkg/pkgcachegen.cc:192
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (नयाठसंसà¥à¤•à¤°à¤£ २)"
+
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सकà¥à¤·à¤® गरेको पà¥à¤¯à¤¾à¤•à¥‡à¤œ नामहरà¥à¤•à¥‹ नमà¥à¤¬à¤°à¤²à¤¾à¤ˆ तपाईà¤à¤²à¥‡ उछिनà¥à¤¨à¥à¤­à¤¯à¥‹ । "
+
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सकà¥à¤·à¤® गरेको संसà¥à¤•à¤°à¤£à¤¹à¤°à¥à¤•à¥‹ नमà¥à¤¬à¤°à¤²à¤¾à¤ˆ तपाईà¤à¤²à¥‡ उछिनà¥à¤¨à¥à¤­à¤¯à¥‹ । "
+
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सकà¥à¤·à¤® गरेको निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥à¤•à¥‹ नमà¥à¤¬à¤°à¤²à¤¾à¤ˆ तपाईà¤à¤²à¥‡ उछिनà¥à¤¨à¥à¤­à¤¯à¥‹ । "
+
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (pkg फेला पारà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ )"
+
+#: apt-pkg/pkgcachegen.cc:254
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr " %s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ (संकलन फाइलले उपलबà¥à¤§ गरà¥à¤¦à¤›)"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¦à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s %s फेला परेन"
+
+#: apt-pkg/pkgcachegen.cc:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ सूची %s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ सकिà¤à¤¨ "
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "फाइल उपलबà¥à¤§à¤¤à¤¾à¤¹à¤°à¥‚ संकलन गरिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "सà¥à¤°à¥‹à¤¤ कà¥à¤¯à¤¾à¤¸ बचत गरà¥à¤¦à¤¾ IO तà¥à¤°à¥à¤Ÿà¤¿"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "पà¥à¤¨:नामकरण असफल गरियो, %s (%s -> %s) ।"
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum मेल भà¤à¤¨"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "निमà¥à¤¨ कà¥à¤žà¥à¤œà¥€ IDs को लागि कà¥à¤¨à¥ˆ सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤žà¥à¤œà¥€ उपलबà¥à¤§ छैन:\n"
+
+#: apt-pkg/acquire-item.cc:753
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"%s पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि मैले फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ सकिन । यसको मतलब तपाईà¤à¤²à¥‡ मà¥à¤¯à¤¾à¤¨à¥à¤²à¥à¤²à¥€ यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ "
+"निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । (arch हराà¤à¤°à¤¹à¥‡à¤•à¥‹ कारणले) "
+
+#: apt-pkg/acquire-item.cc:812
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"%s पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि मैले फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ सकिन । यसको मतलब तपाईà¤à¤²à¥‡ मà¥à¤¯à¤¾à¤¨à¥à¤²à¥à¤²à¥€ यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ "
+"निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
+
+#: apt-pkg/acquire-item.cc:848
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरू दूषित भठ। पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s को लागि कà¥à¤¨à¥ˆ फाइलनाम: फाà¤à¤Ÿ छैन ।"
+
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr "साइज मेल खाà¤à¤¨"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "बिकà¥à¤°à¤¤à¤¾ बà¥à¤²à¥à¤• %s ले कà¥à¤¨à¥ˆ औठाछाप समाविषà¥à¤Ÿ गरà¥à¤¦à¥ˆà¤¨"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"सिडी रोम माउनà¥à¤Ÿ विनà¥à¤¦à¥ पà¥à¤°à¤¯à¥‹à¤— गरिदैछ %s\n"
+"सिडी रोम माउनà¥à¤Ÿ गरिदैछ\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "परिचय गराइदैछ.."
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "लेबà¥à¤² भणà¥à¤¡à¤¾à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥:%s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "सिडी रोम माउनà¥à¤Ÿ विनà¥à¤¦à¥ पà¥à¤°à¤¯à¥‹à¤— गरिदैछ %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "सिडी रोम अनमाउनà¥à¤Ÿ गरिदैछ\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "डिसà¥à¤•à¥‹ लागि परà¥à¤–िदै...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "सिडी रोम माउनà¥à¤Ÿ गरिदै...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरà¥à¤•à¥‹ लागि डिसà¥à¤• सà¥à¤•à¥à¤¯à¤¾à¤¨ गरिदैछ...\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr " %i पà¥à¤¯à¤¾à¤•à¥‡à¤œ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾à¤¹à¤°à¥‚, %i सà¥à¤°à¥‹à¤¤ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ र %i हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°à¤¹à¤°à¥‚ फेला परे\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "तà¥à¤¯à¥‹ वैध नाम होइन, फेरी पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"यो डिसà¥à¤•à¤•à¥‹ नाम:\n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "पà¥à¤¯à¤•à¥‡à¤œ सूचिहरू पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¥€ गरिदैछ..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "नयाठसà¥à¤°à¥‹à¤¤ सूचि लेखिदैछ\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "यो डिसà¥à¤•à¤•à¥‹ लागि सà¥à¤°à¥‹à¤¤ सूचि पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿à¤¹à¤°à¥‚:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "सिडी रोम अनमाउनà¥à¤Ÿ गरिदैछ..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i रेकरà¥à¤¡à¤¹à¤°à¥‚ लेखियो ।\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "हराइरहेको फाइल %i हरू संगै %i रेकरà¥à¤¡à¤¹à¤°à¥‚ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "मेल नखाà¤à¤•à¤¾ फाइल %i हरू संगै %i रेकरà¥à¤¡à¤¹à¤°à¥‚ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "हराइरहेको फाइल %i हरू र मेल नखाà¤à¤•à¤¾ फाइल %i हरू संगै %i रेकरà¥à¤¡à¤¹à¤°à¥‚ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr " %s तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr " %s अनपà¥à¤¯à¤¾à¤• गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr " %s कनफिगर गरà¥à¤¨ तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr " %s कनफिगर गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr " %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr " %s हटाउन तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr " %s हटाइदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr " %s हटà¥à¤¯à¥‹"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr " %s पूरà¥à¤£ रà¥à¤ªà¤²à¥‡ हटाउन तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Completely removed %s"
+msgstr " %s पूरà¥à¤£ रà¥à¤ªà¤²à¥‡ हटà¥à¤¯à¥‹"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "जडान असमायिक बनà¥à¤¦ भयो"
diff --git a/po/nl.po b/po/nl.po
index ac95a305c..9613e03f1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-10 17:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -146,14 +146,14 @@ msgstr " Versietabel:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,22 @@ msgstr ""
"\n"
"Zie de apt-cache(8) en apt.conf(5) handleidingen voor meer informatie.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Medium wisselen: Gelieve de schijf met label\n"
+" '%s'\n"
+"in het station '%s' te plaatsen en op 'enter' te drukken\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenten niet in paren"
@@ -290,7 +306,7 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -419,115 +435,126 @@ msgstr "Er waren geen passende selecties"
msgid "Some files are missing in the package file group `%s'"
msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB is verouderd, opwaardering %s wordt geprobeerd"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kan het DB-bestand %s niet openen: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Bestandsdatum is veranderd %s"
+msgid "Failed to stat %s"
+msgstr "Status opvragen van %s is mislukt"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archief heeft geen 'control'-record"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kon map %s niet lezen\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kon de status van %s niet opvragen\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Er zijn fouten van toepassing op het bestand "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Oplossen van %s is mislukt"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Doorlopen boomstructuur is mislukt"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Openen van %s is mislukt"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " OntlLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Waarde van link %s weergeven is mislukt"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Ontlinken van %s is mislukt"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linken van %s aan %s is mislukt"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB is bereikt.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Status opvragen van %s is mislukt"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s heeft geen voorrangsingang\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s heeft geen voorrangsingang\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -623,79 +650,79 @@ msgstr "Probleem bij het ontlinken van %s"
msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "maar %s is geïnstalleerd"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal geïnstalleerd worden"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "maar het is niet geïnstalleerd"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "maar het zal niet geïnstalleerd worden"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " of"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegens %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -704,145 +731,145 @@ msgstr ""
"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden\n"
"Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten geïnstalleerd, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw geïnstalleerd, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Vereisten worden verbeterd..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislukt."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kan vereisten niet verbeteren"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Klaar"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Sommige pakketten konden niet geauthenticeerd worden"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout bij het toevoegen van een omleiding"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "U heeft niet voldoende vrije schijfruimte op %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -853,28 +880,28 @@ msgstr ""
"Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Afbreken."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -882,49 +909,49 @@ msgstr ""
"Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
"fix-missing proberen?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Geen oplossing voor de missende pakketten gevonden."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Installatie wordt afgebroken."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
"gevraagd.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Geïnstalleerd]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "U dient er één expliciet te selecteren voor installatie."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -935,50 +962,50 @@ msgstr ""
"een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
"verouderd is, of enkel beschikbaar is van een andere bron\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Echter, de volgende pakketten vervangen dit:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakket %s heeft geen installeerbare kandidaat"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is reeds de nieuwste versie.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -986,27 +1013,46 @@ msgstr ""
"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
"zijn oudere versies van gebruikt."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "De volgende informatie helpt u mogelijk verder:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1060,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1025,7 +1071,7 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1035,119 +1081,120 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "De volgende informatie helpt u mogelijk verder:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald "
"moetworden"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1156,7 +1203,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1165,32 +1212,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1381,19 +1428,19 @@ msgstr "De beschikbare informatie wordt samengevoegd"
msgid "Failed to create pipes"
msgstr "Aanmaken pijp is mislukt"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Uitvoeren van gzip is mislukt "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Beschadigd archief"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
@@ -1454,7 +1501,7 @@ msgstr "Dubbel configuratiebestand %s/%s"
msgid "Failed to write file %s"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Sluiten van bestand %s is mislukt"
@@ -1507,7 +1554,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -1538,9 +1586,9 @@ msgstr ""
"De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Pakketlijsten worden ingelezen"
@@ -1554,7 +1602,7 @@ msgstr "Verspringen naar de beheermap %sinfo is mislukt"
msgid "Internal error getting a package name"
msgstr "Interne fout bij het ophalen van de pakketnaam"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Bestandslijst worden ingelezen"
@@ -1601,10 +1649,6 @@ msgstr "Interne fout bij het toevoegen van een omleiding"
msgid "The pkg cache must be initialized first"
msgstr "De pakketcache dient eerst geïnitialiseerd te zijn"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Bestandslijst wordt ingelezen"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1681,12 +1725,12 @@ msgstr "Bestand niet gevonden"
msgid "File not found"
msgstr "Bestand niet gevonden"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Status opvragen is mislukt"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -1814,7 +1858,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1837,7 +1881,7 @@ msgstr "Data transfer is mislukt, server zei: %s"
msgid "Query"
msgstr "Zoekopdracht"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Aanroepen mislukt van "
@@ -1866,71 +1910,71 @@ msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kon niet verbinden met %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Er wordt verbinding gemaakt met %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kon '%s' niet vinden"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tijdelijke fout bij het opzoeken van '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Kan niet verbinden met %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kon '%s' niet vinden"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Kon vergrendeling %s niet verkrijgen"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1946,79 +1990,79 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Interne fout"
@@ -2031,7 +2075,7 @@ msgstr "Kan een leeg bestand niet mmappen"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2156,7 +2200,7 @@ msgstr "Ongeldige operatie %s"
msgid "Unable to stat the mount point %s"
msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kan %s niet veranderen"
@@ -2304,74 +2348,89 @@ msgstr "optioneel"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Boom van vereisten wordt opgebouwd"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidaat-versies"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generatie vereisten"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "De beschikbare informatie wordt samengevoegd"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van %s is mislukt"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van bestand %s is mislukt"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kon pakketbestand %s niet ontleden (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' is onbekend op regel %u in bronlijst %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
@@ -2393,7 +2452,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexbestandtype '%s' wordt niet ondersteund"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2401,7 +2460,7 @@ msgstr ""
"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2409,7 +2468,7 @@ msgstr ""
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast."
@@ -2423,11 +2482,18 @@ msgstr "Lijstmap %spartial is afwezig."
msgid "Archive directory %spartial is missing."
msgstr "Archiefmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Bestandslijst worden ingelezen"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2438,7 +2504,7 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
msgid "Method %s did not start correctly"
msgstr "Methode %s startte niet op de juiste manier"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2446,12 +2512,12 @@ msgstr ""
" '%s'\n"
"in het station '%s' te plaatsen en op 'enter' te drukken\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2489,84 +2555,84 @@ msgstr "Pintype %s wordt niet begrepen"
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Fout tijdens verwerken van %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Fout tijdens verwerken van %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Fout tijdens verwerken van %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Fout tijdens verwerken van %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Fout tijdens verwerken van %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Fout tijdens verwerken van %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Wauw, u heeft meer pakketten dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wauw, u heeft meer versies dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fout tijdens verwerken van %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakket %s %s werd niet gevonden bij het verwerken van de "
"bestandsafhankelijkheden"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
@@ -2575,11 +2641,15 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2658,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2667,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2675,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2751,18 +2821,28 @@ msgid "Removed %s"
msgstr "Aanbevelingen"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Configuratiebestand %s wordt geopend"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Verwijderen van %s is mislukt"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbinding werd voortijdig afgebroken"
+#~ msgid "File date has changed %s"
+#~ msgstr "Bestandsdatum is veranderd %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Bestandslijst wordt ingelezen"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Kon vergrendeling %s niet verkrijgen"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s"
diff --git a/po/nn.po b/po/nn.po
index 221677577..f2ac29aab 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: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -149,14 +149,14 @@ msgstr " Versjonstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert på %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -230,6 +230,22 @@ msgstr ""
" -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
"Du finn meir informasjon på manualsidene apt-cache(8) og apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" «%s»\n"
+"i stasjonen «%s» og trykk Enter.\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Ikkje parvise argument"
@@ -291,7 +307,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -413,115 +429,126 @@ msgstr "Ingen utval passa"
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer manglar i pakkefilgruppa %s"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB er for gammal, forsøkjer å oppgradere %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikkje opna DB-fila %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Fildatoen er endra %s"
+msgid "Failed to stat %s"
+msgstr "Klarte ikkje få status til %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen kontrollpost"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Klarte ikkje få peikar"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Å: Klarte ikkje lesa katalogen %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Å: Klarte ikkje få status til %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "Å: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikkje slå opp %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Treklatring mislukkast"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikkje opna %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikkje lesa lenkja %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikkje oppheva lenkja %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikkje lenkja %s til %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %sB er nådd.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Klarte ikkje få status til %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppføring\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s har inga overstyringsoppføring\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s har inga overstyringsoppføring\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -617,79 +644,79 @@ msgstr "Problem ved oppheving av lenkje til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet på %s til %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men lèt seg ikkje installera"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Dei følgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Dei følgjande pakkane vil verta FJERNA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Dei følgjande pakkane er haldne tilbake:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Dei følgjande pakkane vil verta oppgraderte:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -698,146 +725,146 @@ msgstr ""
"ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
"Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte på nytt, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Rettar på krav ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " mislukkast."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Klarte ikkje retta på krav"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Klarte ikkje minimera oppgraderingsmengda"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Ferdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nokre pakkar kunne ikkje bli autentisert"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Nokre pakkar må fjernast, men fjerning er slått av."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje låsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Må henta %sB/%sB med arkiv.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Må henta %sB med arkiv.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikkje nok ledig plass i %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +875,28 @@ msgstr ""
"For å halda fram, må du skriva nøyaktig «%s».\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryt."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,49 +904,49 @@ msgstr ""
"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
"«--fix-missing»."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Klarte ikkje retta opp manglande pakkar."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryt installasjon."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Merk, vel %s i staden for %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar over %s, for den er installert frå før og ikkje sett til "
"oppgradering.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du må velja ein som skal installerast."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -930,49 +957,49 @@ msgstr ""
"av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n"
"eller er berre tilgjengeleg frå ei anna kjelde\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dei følgjande pakkane kan brukast i staden:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Det finst ingen installasjonskandidat for pakken %s"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Den nyaste versjonen av %s er installert frå før.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgåva «%s» av «%s»"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen «%s» av «%s»"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje låsa listekatalogen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -980,26 +1007,45 @@ msgstr ""
"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
"filer er brukte i staden."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil. AllUpgrade øydelagde noko"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade øydelagde noko"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex «%s»\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1007,7 +1053,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
"ei løysing)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1019,7 +1065,7 @@ msgstr ""
"distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i «Incoming»."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1029,122 +1075,123 @@ msgstr ""
"pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Øydelagde pakkar"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Føreslåtte pakkar:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Tilrådde pakkar"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade øydelagde noko"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Må henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen «%s» mislukkast.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1153,31 +1200,31 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Støtta modular:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1357,19 +1404,19 @@ msgstr "Flettar informasjon om tilgjengelege pakkar"
msgid "Failed to create pipes"
msgstr "Klarte ikkje oppretta røyr"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Klarte ikkje køyra gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Øydelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjend TAR-hovud type %u, medlem %s"
@@ -1430,7 +1477,7 @@ msgstr "Dobbel oppsettsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Klarte ikkje skriva fila %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikkje lukka fila %s"
@@ -1483,7 +1530,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -1514,9 +1562,9 @@ msgstr ""
"Infokatalogen og den mellombelse katalogen må vera på det same filsystemet"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Les pakkelister"
@@ -1530,7 +1578,7 @@ msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
msgid "Internal error getting a package name"
msgstr "Intern feil ved henting av pakkenamn"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Les filliste"
@@ -1577,10 +1625,6 @@ msgstr "Intern feil ved tilleggjing av avleiing"
msgid "The pkg cache must be initialized first"
msgstr "Pakkelageret må først klargjerast"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Les filliste"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1656,12 +1700,12 @@ msgstr "Fann ikkje fila"
msgid "File not found"
msgstr "Fann ikkje fila"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Klarte ikkje få status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -1789,7 +1833,7 @@ msgstr "Tidsavbrot på tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
@@ -1812,7 +1856,7 @@ msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
msgid "Query"
msgstr "Spørjing"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
@@ -1841,71 +1885,71 @@ msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot på sambandet"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikkje kopla til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Koplar til %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikkje slå opp «%s»"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Mellombels feil ved oppslag av «%s»"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Klarte ikkje slå opp «%s»"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Klarte ikkje låsa %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1921,76 +1965,76 @@ msgstr "Klarte ikkje opna røyr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil frå %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ventar på hovud"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Øydelagd hovudlinje"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrot på sambandet"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing frå tenaren"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Øydelagde hovuddata"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern feil"
@@ -2003,7 +2047,7 @@ msgstr "Kan ikkje utføra mmap på ei tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2124,7 +2168,7 @@ msgstr "Ugyldig operasjon %s"
msgid "Unable to stat the mount point %s"
msgstr "Klarte ikkje få status til monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Klarte ikkje byta til %s"
@@ -2269,74 +2313,89 @@ msgstr "valfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Byggjer kravtre"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidatversjonar"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Genererer kravforhold"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
@@ -2358,13 +2417,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiltypen «%s» er ikkje støtta"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2372,7 +2431,7 @@ msgstr ""
"Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
@@ -2387,11 +2446,18 @@ msgstr "Listekatalogen %spartial manglar."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2402,7 +2468,7 @@ msgstr "Finn ikkje metodedrivaren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2410,12 +2476,12 @@ msgstr ""
" «%s»\n"
"i stasjonen «%s» og trykk Enter.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» er ikkje støtta"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2450,82 +2516,82 @@ msgstr "Skjønar ikkje spikringstypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Feil ved behandling av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Feil ved behandling av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Feil ved behandling av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Feil ved behandling av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Feil ved behandling av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Feil ved behandling av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Feil ved behandling av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Feil ved behandling av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Feil ved behandling av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Klarte ikkje få status på kjeldepakkelista %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
@@ -2534,11 +2600,15 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2547,7 +2617,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2555,14 +2625,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2706,18 +2776,28 @@ msgid "Removed %s"
msgstr "Tilrådingar"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Opnar oppsettsfila %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Klarte ikkje fjerna %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Sambandet vart uventa stengd"
+#~ msgid "File date has changed %s"
+#~ msgstr "Fildatoen er endra %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Les filliste"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Klarte ikkje låsa %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Ukjend utgjevar-ID «%s» i linja %u i kjeldelista %s"
diff --git a/po/pl.po b/po/pl.po
index 457116536..ce84c7ab9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,13 +1,13 @@
# Advanced Package Transfer - APT message translation catalog
# Polish translation by:
# Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004.
-# Bartosz Fenski <fenio@debian.org>, 2005
+# Bartosz Fenski <fenio@debian.org>, 2005, 2006
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-11 11:47+0100\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
"MIME-Version: 1.0\n"
@@ -147,14 +147,14 @@ msgstr " Tabela wersji:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s dla %s %s skompilowany %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -230,6 +230,18 @@ msgstr ""
"Wiêcej informacji mo¿na znale¼æ na stronach podrêcznika apt-cache(8)\n"
"oraz apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Proszê wprowadziæ nazwê dla tej p³yty, np 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Proszê w³o¿yæ dysk do napêdu i nacisn±æ enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Powtórz ten proces dla reszty p³yt."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenty nie s± w parach"
@@ -291,7 +303,7 @@ msgstr ""
" -c=? Czytaj ten plik konfiguracyjny.\n"
" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nie uda³o siê pisaæ do %s"
@@ -322,10 +334,9 @@ msgstr "B³±d przy zapisywaniu nag³ówka do pliku zawarto¶ci"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr "B³±d przy przetwarzaniu zawarto¶ci %s"
+msgstr "B³±d podczas przetwarzania zawarto¶ci %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -416,115 +427,126 @@ msgstr "Nie dopasowano ¿adnej nazwy"
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:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Baza jest przestarza³a, próbujê zaktualizowaæ %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nie uda³o siê otworzyæ pliku DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Data pliku uleg³a zmianie %s"
+msgid "Failed to stat %s"
+msgstr "Nie uda³o siê wykonaæ operacji stat na %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archiwum nie posiada rekordu control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nie uda³o siê pobraæ kursora"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nie uda³o siê odczytaæ katalogu %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nie mo¿na wykonaæ operacji stat na %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: B³êdy odnosz± siê do pliku "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Nie uda³o siê przet³umaczyæ nazwy %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Przej¶cie po drzewie nie powiod³o siê"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Nie uda³o siê otworzyæ %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Od³±czenie %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie uda³o siê odczytaæ dowi±zania %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie uda³o siê usun±æ %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nie uda³o siê dowi±zaæ %s do %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Osi±gniêto ograniczenie od³±czania %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Nie uda³o siê wykonaæ operacji stat na %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archiwum nie posiada³o pola pakietu"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nie posiada wpisu w pliku override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nie posiada wpisu w pliku override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -620,257 +642,255 @@ msgstr "Problem przy usuwaniu %s"
msgid "Failed to rename %s to %s"
msgstr "Nie uda³o siê zmieniæ nazwy %s na %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "B³±d kompilacji wyra¿enia regularnego - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zostaæ zainstalowany"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale nie da siê go zainstalowaæ"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " lub"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Zostan± zainstalowane nastêpuj±ce NOWE pakiety:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nastêpuj±ce pakiety zostan± zaktualizowane:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostan± zainstalowane STARE wersje nastêpuj±cych pakietów:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Zostan± zmienione nastêpuj±ce zatrzymane pakiety:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety\n"
+"UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety.\n"
"Nie powinno siê tego robiæ, chyba ¿e dok³adnie wiesz, co robisz!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu przeinstalowywanych, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofniêtych wersji, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Naprawianie zale¿no¶ci..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " nie uda³o siê."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nie uda³o siê naprawiæ zale¿no¶ci"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Gotowe"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ostrze¿enie uwierzytelniania zignorowano.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "By³y problemy, a u¿yto -y bez --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "B³±d wewnêtrzny, InstallPackages u¿yto z zepsutymi pakietami!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "B³±d wewnêtrzny przy dodawaniu objazdu"
+msgstr "B³±d wewnêtrzny, sortowanie niezakoñczone"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nie uda³o siê zablokowaæ katalogu pobierania"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nie uda³o siê odczytaæ list ¼róde³."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Dziwne.. rozmiary siê nie zgadzaj±, zg³o¶ pod apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Konieczne pobranie %sB archiwów.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca"
+msgstr "Nie uda³o siê ustaliæ ilo¶ci wolnego miejsca w %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Tak, rób jak mówiê!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Zaraz zrobisz co¶ potencjalnie szkodliwego\n"
+"Zaraz zrobisz co¶ potencjalnie szkodliwego.\n"
"Aby kontynuowaæ wpisz zdanie '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Przerwane."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowaæ [T/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie uda³o siê pobraæ %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Nie uda³o siê pobraæ niektórych plików"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Ukoñczono pobieranie w trybie samego pobierania"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -878,48 +898,48 @@ msgstr ""
"Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update "
"lub u¿yæ opcji --fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Przerywanie instalacji"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Uwaga, wybieranie %s zamiast %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Zainstalowany]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -930,50 +950,50 @@ msgstr ""
"Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n"
"pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych ¼róde³.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakiet %s nie ma kandydata do instalacji"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s jest ju¿ w najnowszej wersji.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersjê %s (%s) dla %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga ¿adnych argumentów"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nie uda³o siê zablokowaæ katalogu list"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -981,25 +1001,44 @@ msgstr ""
"Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub "
"zosta³a u¿yta ich starsza wersja."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie uda³o siê odnale¼æ pakietu %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1007,7 +1046,7 @@ msgstr ""
"Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub "
"podaj rozwi±zanie)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1015,134 +1054,134 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
"Nie uda³o siê zainstalowaæ niektórych pakietów. Mo¿e to oznaczaæ,\n"
-"¿e za¿±da³e¶/³a¶ niemo¿liwej sytuacji lub u¿ywasz dystrybucji\n"
-"niestabilnej, w której niektóre pakiety nie zosta³y jeszcze utworzone\n"
-"lub przeniesione z katalogu Incoming (\"Przychodz±ce\")."
+"¿e za¿±dano niemo¿liwej sytuacji lub u¿ywasz dystrybucji niestabilnej,\n"
+"w której niektóre pakiety nie zosta³y jeszcze utworzone lub przeniesione\n"
+"z katalogu Incoming (\"Przychodz±ce\")."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Poniewa¿ za¿±da³e¶/³a¶ tylko jednej operacji, jest bardzo prawdopodobne, ¿e\n"
+"Poniewa¿ za¿±dno tylko jednej operacji, jest bardzo prawdopodobne, ¿e\n"
"danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n"
"b³±d."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pakiety s± b³êdne"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Nie uda³o siê"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o"
+msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Pomijanie ju¿ pobranego pliku '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz ¼ród³o %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nie uda³o siê pobraæ niektórych archiwów."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiod³o.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Sprawd¼ czy pakiet 'dpkg-dev' jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiod³o.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Proces potomny zawiód³"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zale¿no¶ci czasu budowania.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1151,7 +1190,7 @@ msgstr ""
"Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1160,32 +1199,32 @@ msgstr ""
"Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Obs³ugiwane modu³y:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1369,19 +1408,19 @@ msgstr "£±czenie informacji o dostêpnych pakietach"
msgid "Failed to create pipes"
msgstr "Nie uda³o siê utworzyæ potoków"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Nie uda³o uruchomiæ programu gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Uszkodzone archiwum"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Nieznany typ nag³ówka TAR %u, sk³adnik %s"
@@ -1438,11 +1477,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Zduplikowany plik konfiguracyjny %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "Nie uda³o siê zapisaæ pliku %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Nie uda³o siê zamkn±æ pliku %s"
@@ -1495,7 +1534,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nie mo¿na czytaæ %s"
@@ -1525,9 +1565,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Pliki info i temp musz± byæ na tym samym systemie plików"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Czytanie list pakietów"
@@ -1541,7 +1581,7 @@ msgstr "Nie uda³o siê przej¶æ do katalogu administracyjnego %sinfo"
msgid "Internal error getting a package name"
msgstr "B³±d wewnêtrzny podczas pobierania nazwy pakietu"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Czytanie listy plików"
@@ -1588,10 +1628,6 @@ msgstr "B³±d wewnêtrzny przy dodawaniu objazdu"
msgid "The pkg cache must be initialized first"
msgstr "Magazyn podrêczny pakietów musi wcze¶niej zostaæ zainicjalizowany"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Czytanie listy plików"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1657,20 +1693,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nie uda³o siê odmontowaæ CD-ROM-u w %s, byæ mo¿e wci±¿ jest u¿ywany."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Nie odnaleziono pliku"
+msgstr "Nie odnaleziono dysku."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nie odnaleziono pliku"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Nie uda³o siê wykonaæ operacji stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nie uda³o siê ustawiæ czasu modyfikacji"
@@ -1799,7 +1834,7 @@ msgstr "Przekroczony czas po³±czenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie uda³o siê przyj±æ po³±czenia"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie uda³o siê obliczyæ skrótu pliku"
@@ -1822,7 +1857,7 @@ msgstr "Nie uda³o siê przes³aæ danych, serwer powiedzia³ '%s'"
msgid "Query"
msgstr "Info"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Nie mo¿na wywo³aæ "
@@ -1851,75 +1886,78 @@ msgstr "Nie uda³o siê zainicjalizowaæ po³±czenia z %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s), przekroczenie czasu po³±czenia"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "£±czenie z %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tymczasowy b³±d przy t³umaczeniu '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Co¶ niegodziwego sta³o siê przy t³umaczeniu '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Nie uda³o siê po³±czyæ z %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt d³uga. Wychodzimy."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"B³±d wewnêtrzny: Prawid³owa sygnatura, ale nie nie uda³o siê ustaliæ "
+"jejodcisku?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nie uda³o siê uzyskaæ blokady %s"
+msgstr "Napotkano przynajmniej jedn± nieprawid³ow± sygnaturê."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " by zweryfikowaæ sygnaturê (czy gnupg jest zainstalowane?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Nieznany b³±d podczas uruchamiania gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:"
+msgstr "Nastêpuj±ce sygnatury by³y b³êdne:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Nastêpuj±ce sygnatury nie mog³y zostaæ zweryfikowane z powodu braku klucza "
+"publicznego:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1931,76 +1969,76 @@ msgstr "Nie uda³o siê otworzyæ potoku dla %s"
msgid "Read error from %s process"
msgstr "B³±d odczytu z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Oczekiwanie na nag³ówki"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Nieprawid³owa linia nag³ówka"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Operacja select nie powiod³a siê"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Przekroczenie czasu po³±czenia"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "B³±d przy pisaniu do pliku wyj¶ciowego"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "B³±d przy pisaniu do pliku"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "B³±d przy pisaniu do pliku"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "B³±d czytania z serwera"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "B³êdne dane nag³ówka"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Po³±czenie nie uda³o siê"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "B³±d wewnêtrzny"
@@ -2013,7 +2051,7 @@ msgstr "Nie mo¿na wykonaæ mmap na pustym pliku"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie uda³o siê wykonaæ mmap %lu bajtów"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2135,7 +2173,7 @@ msgstr "Nieprawid³owa operacja %s"
msgid "Unable to stat the mount point %s"
msgstr "Nie uda³o siê wykonaæ operacji stat na punkcie montowania %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nie uda³o siê przej¶æ do %s"
@@ -2280,74 +2318,89 @@ msgstr "opcjonalny"
msgid "extra"
msgstr "dodatkowy"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Budowanie drzewa zale¿no¶ci"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandyduj±ce wersje"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generowanie zale¿no¶ci"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "£±czenie informacji o dostêpnych pakietach"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie uda³o siê otworzyæ %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie uda³o siê zapisaæ pliku %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (bezwzglêdna dystrybucja)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w li¶cie ¼róde³ %s jest zbyt d³uga."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (typ)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ '%s' jest nieznany - linia %u listy ¼róde³ %s"
+msgstr "Typ '%s' jest nieznany w linii %u listy ¼róde³ %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (identyfikator producenta)"
@@ -2369,14 +2422,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2384,9 +2437,9 @@ msgstr ""
"B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane "
"\"zatrzymanymi\" pakietami."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nie uda³o siê naprawiæ problemów, zatrzyma³e¶/³a¶ uszkodzone pakiety."
+msgstr "Nie uda³o siê naprawiæ problemów, zatrzymano uszkodzone pakiety."
#: apt-pkg/acquire.cc:62
#, c-format
@@ -2398,10 +2451,17 @@ msgstr "Brakuje katalogu list %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Brakuje katalogu archiwów %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pobieranie pliku %li z %li (%s pozosta³o)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Czytanie listy plików"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2413,20 +2473,17 @@ msgstr "Nie uda³o siê odnale¼æ sterownika metody %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nie uruchomi³a siê poprawnie."
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Zmiana no¶nika: Proszê w³o¿yæ dysk oznaczony\n"
-" '%s'\n"
-"do napêdu '%s' i nacisn±æ enter\n"
+msgstr "W³ó¿ do napêdu '%s' dysk o nazwie: '%s' i naci¶nij enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietów '%s' nie jest obs³ugiwany"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów"
@@ -2460,87 +2517,85 @@ msgstr "Nierozpoznany typ przypinania %s"
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypiêcia"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Magazyn podrêczny ma niezgodny system wersji"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewPackage)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage1)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage2)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewFileVer1)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion1)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage3)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion2)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Och, przekroczy³e¶/³a¶ liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ."
+"Och, przekroczono liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Och, przekroczy³e¶/³a¶ liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ."
+msgstr "Och, przekroczono liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Och, przekroczy³e¶/³a¶ liczbê zale¿no¶ci, któr± ten APT jest w stanie "
-"obs³u¿yæ."
+"Och, przekroczono liczbê zale¿no¶ci, któr± ten APT jest w stanie obs³u¿yæ."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (FindPkg)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (CollectFileProvides)"
+msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-"Pakiet %s %s nie zosta³ odnaleziony przy przetwarzaniu zale¿no¶ci plików"
+"Pakiet %s %s nie zosta³ odnaleziony podczas przetwarzania zale¿no¶ci plików"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nie uda³o siê wykonaæ operacji stat na li¶cie pakietów ¼ród³owych %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Zbieranie zapewnieñ plików"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³"
@@ -2549,11 +2604,15 @@ msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "B³êdna suma MD5"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Dla nastêpuj±cego identyfikatora klucza brakuje klucza publicznego:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2562,7 +2621,7 @@ msgstr ""
"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
"bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2571,14 +2630,14 @@ msgstr ""
"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
"bêdzie rêcznie naprawiæ ten pakiet."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "B³êdny rozmiar"
@@ -2631,7 +2690,8 @@ msgstr "Skawnowanie p³yty w poszukiwaniu plików indeksu..\n"
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-"Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych i %i sygnatur\n"
+"Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych, %i indeksów "
+"t³umaczeñ i %i sygnatur\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
@@ -2683,55 +2743,89 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami i %i niepasuj±cymi\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Otwieranie %s"
+msgstr "Przygotowanie %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Otwieranie %s"
+msgstr "Rozpakowywanie %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Otwieranie pliku konfiguracyjnego %s"
+msgstr "Przygotowanie do konfiguracji %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "£±czenie z %s"
+msgstr "Konfigurowanie %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Zainstalowana: "
+msgstr " Zainstalowany %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Przygotowanie do usuniêcia %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Otwieranie %s"
+msgstr "Usuwanie %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Poleca"
+msgstr "Usuniêto %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Przygotowanie do konfiguracji %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Nie uda³o siê usun±æ %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Data pliku uleg³a zmianie %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Czytanie listy plików"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nie uda³o siê uruchomiæ "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Przygotowanie do usuniêcia %s wraz z konfiguracj±"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Usuniêto %s wraz z konfiguracj±"
+
+#~ msgid "Total Distinct Descriptions: "
+#~ msgstr "W sumie ró¿nych opisów: "
+
+#~ msgid "Total Desc/File relations: "
+#~ msgstr "W sumie zale¿no¶ci opis/plik: "
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc2)"
+
+#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#~ msgstr ""
+#~ "Och, przekroczono liczbê opisów, któr± ten APT jest w stanie obs³u¿yæ."
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nie uda³o siê na³o¿yæ ³atki na plik"
diff --git a/po/pt.po b/po/pt.po
index 5f8541a67..e179d0a39 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,13 @@
# Debian-PT translation for apt.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2003.
-# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy.
+# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
-"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +101,7 @@ msgstr "Ficheiros de Pacotes :"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote"
+"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -146,14 +145,14 @@ msgstr " Tabela de Versão:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -227,6 +226,19 @@ msgstr ""
" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
"Veja as páginas do manual apt-cache(8) e apt.conf(5) para mais informações.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Por favor insira um Disco no leitor e pressione enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repita este processo para o resto dos CDs no seu conjunto."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumentos não estão em pares"
@@ -289,7 +301,7 @@ msgstr ""
" -c=? Ler este arquivo de configuração\n"
" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -384,7 +396,7 @@ msgstr ""
"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
"especificar um ficheiro override de fontes\n"
"\n"
-"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n"
+"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
@@ -412,115 +424,126 @@ msgstr "Nenhuma selecção coincidiu"
msgid "Some files are missing in the package file group `%s'"
msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB é antiga, tentando uma actualização %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Não foi possível abrir o ficheiro DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Data do ficheiro mudou %s"
+msgid "Failed to stat %s"
+msgstr "Falha ao executar stat %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "O arquivo não tem registro de controle"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Não foi possível ler o directório %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Não foi possível fazer stat %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Erros aplicam-se ao ficheiro "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Falha ao resolver %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Falhou ao abrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou ao executar readlink %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou ao executar unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ao ligar %s a %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Falha ao executar stat %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo pacote"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " maintainer de %s é %s, não %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s não possui entrada override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -616,259 +639,257 @@ msgstr "Problema ao executar unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Falha ao renomear %s para %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mas não está instalável"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes NOVOS pacotes serão instalados:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Os seguintes pacotes serão REMOVIDOS:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Os seguintes pacotes serão actualizados:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Aos seguintes pacotes será feito o DOWNGRADE :"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados :"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVISO: Os seguintes pacotes essenciais serão removidos\n"
-"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
-"fazer!"
+"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
+"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigindo dependências..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossível corrigir dependências"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossível minimizar o conjunto de actualizações"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Feito"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Você pode querer executar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependências não satisfeitas. Tente utilizar -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO: Os seguintes pacotes não podem ser autenticados"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticação ultrapassado.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalar estes pacotes sem verificação [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não poderam ser autenticados"
+msgstr "Alguns pacotes não puderam ser autenticados"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e -y foi usado sem --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É necessário fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
+"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Desculpe, você não tem espaço suficiente em %s"
+msgstr "Impossível de determinar espaço livre em %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço livre suficiente em %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only especificado mas essa não é uma operação trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Você está prestes a fazer algo potencialmente prejudicial\n"
+"Você está prestes a fazer algo potencialmente nocivo.\n"
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -876,47 +897,47 @@ msgstr ""
"Impossível obter alguns arquivos, execute talvez apt-get update ou tente com "
"--fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados actualmente"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir os pacotes em falta."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando a Instalação."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s em vez de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr "Você deve selecionar explicitamente um para instalar."
+msgstr "Você deve seleccionar explicitamente um para instalar."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -927,51 +948,51 @@ msgstr ""
"Isso pode significar que o pacote falta, ficou obsoleto ou\n"
"está disponível somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
-msgstr "No entanto, os seguintes pacotes substituem-o:"
+msgstr "No entanto, os seguintes pacotes substituem-no:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s não tem candidato para instalação"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalação de %s não é possível, o download do mesmo não pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já é a versão mais recente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrado"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no directório de listas"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -979,25 +1000,44 @@ msgstr ""
"Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte informação pode ajudar a resolver a situação:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o solucionador de problemas estragou coisas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1005,7 +1045,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1014,176 +1054,176 @@ msgid ""
msgstr ""
"Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
"você solicitou uma situação impossível ou se você está a usar a\n"
-"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
+"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Já que você requisitou uma única operação é extremamanete provável que o \n"
+"Já que você requisitou uma única operação é extremamente provável que o \n"
"pacote esteja simplesmente não instalável e deve ser enviado um relatório "
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte informação pode ajudar a resolver a situação:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade quebrou as coisas"
+msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
+"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
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 requesitos de versão"
+"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1368,19 +1408,19 @@ msgstr "Juntando informação Disponível"
msgid "Failed to create pipes"
msgstr "Falha ao criar pipes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Falha ao executar gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
@@ -1403,7 +1443,7 @@ msgstr "Arquivo é demasiado pequeno"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "Falha ao ler os cabeçahos do arquivo"
+msgstr "Falha ao ler os cabeçalhos do arquivo"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
@@ -1424,7 +1464,7 @@ msgstr "Erro Interno em AddDiversion"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s"
+msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
#: apt-inst/filelist.cc:510
#, c-format
@@ -1437,11 +1477,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de configuração duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "Falha ao escrever ficheiro %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Falha ao fechar ficheiro %s"
@@ -1473,7 +1513,7 @@ msgstr "O caminho de desvio é muito longo"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "O directório %s está sendo substituído por um não-diretório"
+msgstr "O directório %s está sendo substituído por um não-directório"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
@@ -1491,10 +1531,11 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s"
+msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1524,9 +1565,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "A Ler Listas de Pacotes"
@@ -1540,7 +1581,7 @@ msgstr "Falha ao mudar para o directório administrativo %sinfo"
msgid "Internal error getting a package name"
msgstr "Erro Interno obtendo um Nome de Pacote"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Lendo Listagem de Ficheiros"
@@ -1587,10 +1628,6 @@ msgstr "Erro Interno ao adicionar um desvio"
msgid "The pkg cache must be initialized first"
msgstr "A cache de pacotes tem de ser inicializada primeiro"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lendo Lista de Ficheiros"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1656,20 +1693,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Arquivo não encontrado"
+msgstr "Disco não encontrado"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Falha ao executar stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Falha ao definir hora de modificação"
@@ -1797,7 +1833,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1820,7 +1856,7 @@ msgstr "Transferência de dados falhou, o servidor respondeu '%s'"
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Impossível invocar "
@@ -1847,77 +1883,81 @@ msgstr "Não posso iniciar a ligação para %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou"
+msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível ligar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Ligando a %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária resolvendo '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Impossível ligar a %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Não foi possível resolver '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
+"digital da chave?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Não foi possível obter lock %s"
+msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " para verificar assinatura (gnupg instalado?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Os seguintes pacotes extra serão instalados:"
+msgstr "As seguintes assinaturas estavam inválidas:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"As seguintes assinaturas não puderam ser verificadas porque a chave pública "
+"não está disponível:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1929,76 +1969,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erro interno"
@@ -2011,7 +2051,7 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selecção %s não encontrada"
@@ -2134,7 +2174,7 @@ msgstr "Operação %s inválida"
msgid "Unable to stat the mount point %s"
msgstr "Impossível executar stat ao ponto de montagem %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossível mudar para %s"
@@ -2279,74 +2319,89 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construindo Ãrvore de Dependências"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versões Candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Geração de Dependência"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Juntando informação Disponível"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou ao abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever ficheiro %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossível o parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha malformada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha malformada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
@@ -2368,7 +2423,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2376,7 +2431,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2384,7 +2439,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
@@ -2396,12 +2451,19 @@ msgstr "Falta directório de listas %spartial."
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "Falta o diretório de repositório %spartial."
+msgstr "Falta o directório de repositório %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A efectuar download de ficheiro %li de %li (%s restantes)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lendo Listagem de Ficheiros"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2413,20 +2475,18 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Troca de mídia: Por favor insira o disco chamado\n"
-" '%s'\n"
-"na drive '%s' e pressione enter\n"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável"
@@ -2443,7 +2503,7 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou "
+"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
"aberto."
#: apt-pkg/cachefile.cc:77
@@ -2463,87 +2523,87 @@ msgstr "Não foi possível entender o tipo de marca %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "A Cache possui um sistema de versões incompatível"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
"suportar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Uau, você excedeu o número de versões que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Um erro ocorreu ao processar %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Obtendo File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
@@ -2552,21 +2612,27 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Não existe qualquer chave pública disponível para as seguintes IDs de "
+"chave:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
-"que você precisa consertar manualmente este pacote. (devido a arquitetura "
+"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2575,7 +2641,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2583,9 +2649,9 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
-msgstr "Tamanho incorreto"
+msgstr "Tamanho incorrecto"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2689,59 +2755,74 @@ msgstr ""
"coincidentes\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "A preparar %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "A desempacotar %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abrindo ficheiro de configuração %s"
+msgstr "A preparar para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Ligando a %s"
+msgstr "A configurar %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalado: "
+msgstr "%s instalado"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "A preparar para remoção de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "A remover %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomenda"
+msgstr "%s removido"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "A preparar para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Falha ao remover %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexão encerrada prematuramente"
+#~ msgid "File date has changed %s"
+#~ msgstr "Data do ficheiro mudou %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Lista de Ficheiros"
+
+#~ msgid "Could not execute "
+#~ msgstr "Impossível de executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "A preparar para remover com a configuração %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removido com a configuração %s"
+
#~ msgid "The pkg cache must be initialize first"
#~ msgstr "A cache de pacotes deve ser inicializada primeiro"
@@ -2824,12 +2905,6 @@ msgstr "Conexão encerrada prematuramente"
#~ msgstr "Falha ao baixar %s %s\n"
#, fuzzy
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e "
-#~ "pressione enter\n"
-
-#, fuzzy
#~ msgid "Couldn't wait for subprocess"
#~ msgstr "Não foi possível checar a lista de pacotes fonte %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8376d4f0a..7b4985337 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-06-16 10:24-0300\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-02-11 17:57-0200\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -147,14 +147,14 @@ msgstr " Tabela de Versão:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -229,6 +229,19 @@ msgstr ""
"Veja as páginas de manual apt-cache(8) e apt.conf(5) para maiores "
"informações.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Por favor, forneça um nome para este Disco, como 'Debian 2.1r1 Disco 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Por favor, insira um Disco no leitor e pressione enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Pepita este processo para o restante dos CDs em seu conjunto."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumentos não estão em pares"
@@ -291,7 +304,7 @@ msgstr ""
" -c=? Ler esse arquivo de configuração\n"
" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -414,115 +427,126 @@ msgstr "Nenhuma seleção correspondente"
msgid "Some files are missing in the package file group `%s'"
msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "A base de dados estava corrompida, arquivo renomeado para %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB é antigo, tentando atualizar %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Impossível abrir arquivo DB %s : %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Data do arquivo mudou %s"
+msgid "Failed to stat %s"
+msgstr "Falha ao checar %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Repositório não possui registro de controle"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossível ler o diretório %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossível checar %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Erros aplicam ao arquivo "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Falha ao resolver %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Falha ao percorrer a árvore"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Falha ao abrir %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Falha ao executar readlink %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Falha ao executar unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falha ao ligar %s a %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Falha ao checar %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s não possui entrada override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s não possui entrada override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -618,258 +642,257 @@ msgstr "Problema executando unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Falha ao renomear %s para %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências desencontradas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "mas não está instalável"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir serão mantidos em suas versões atuais :"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados :"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REBAIXADOS de versão :"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Os pacotes segurados a seguir serão mudados :"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVISO: Os pacotes essenciais a seguir serão removidos\n"
-"Isso NÃO deve ser feito a menos que você saiba exatamente o que está fazendo!"
+"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
+"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
+"fazendo !"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desatualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corrigindo dependências..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Impossível corrigir dependências"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Impossível minimizar o conjunto de atualizações"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Pronto"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependências desencontradas. Tente usar -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO : Os pacotes a seguir não podem ser autenticados !"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticação sobrescrito.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalar estes pacotes sem verificação [s/N] ? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não puderam ser autenticados"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Há problemas e -y foi usado sem --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no diretório de download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Que estranho .. Os tamanhos não batem, informe apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É preciso fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois de desempacotamento, %sB adicionais de espaço em disco serão usados.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Desculpe, você não tem espaço suficiente em %s"
+msgstr "Não foi possível determinar o espaço livre em %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Você não possui espaço suficiente em %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Triviais Apenas especificado mas essa não é uma operação trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Sim, faça o que eu digo!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Você está prestes a fazer algo potencialmente destruidor\n"
+"Você está prestes a fazer algo potencialmente destruidor.\n"
"Para continuar digite a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n] ? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao baixar %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,47 +900,47 @@ msgstr ""
"Impossível pegar alguns arquivos, talvez rodar apt-get update ou tentar com "
"--fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados atualmente"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir pacotes faltosos."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abortando Instalação."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s é um pacote virtual provido por:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Você deve selecionar um explicitamente para instalar."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -928,51 +951,51 @@ msgstr ""
"Isso pode significar que o pacote está faltando, ficou obsoleto ou\n"
"está disponível somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "No entanto, os pacotes a seguir o substituem:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s não tem candidato para instalação"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalação de %s não é possível, o download do mesmo não pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já é a versão mais nova.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrada"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no diretório de listas"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -980,25 +1003,44 @@ msgstr ""
"Alguns arquivos de índice falharam no download, eles foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "A informação a seguir pode ajudar a resolver a situação:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o solucionador de problemas quebrou coisas"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer rodar `apt-get -f install' para corrigir isso:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1048,7 @@ msgstr ""
"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1018,7 +1060,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram \n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1028,117 +1070,117 @@ msgstr ""
"esteja simplesmente não instalável e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "A informação a seguir pode ajudar a resolver a situação:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculando Atualização... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade quebrou as coisas"
+msgstr "Erro Interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omitindo arquivo já obtido '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando desempacotamento de pacote fonte já desempacotado em %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Confira se o pacote dpkg-dev está instalado.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1147,7 +1189,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1156,32 +1198,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, 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: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1365,19 +1407,19 @@ msgstr "Mesclando informação Disponível"
msgid "Failed to create pipes"
msgstr "Falha ao criar pipes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Falha ao executar gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
@@ -1434,11 +1476,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de confgiuração duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "Falha ao gravar arquivo %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Falha ao fechar arquivo %s"
@@ -1491,7 +1533,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1521,9 +1564,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Lendo Lista de Pacotes"
@@ -1537,7 +1580,7 @@ msgstr "Falha ao mudar para o diretorio administrativo %sinfo"
msgid "Internal error getting a package name"
msgstr "Erro Interno obtendo um Nome de Pacote"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Lendo Listagem de Pacotes"
@@ -1581,14 +1624,9 @@ msgid "Internal error adding a diversion"
msgstr "Erro Interno ao adicionar um desvio"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "O cache de pacotes deve ser inicializado primeiro"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lendo Listagem de Pacotes"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1656,20 +1694,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Arquivo não encontrado"
+msgstr "Disco não encontrado."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Falha ao checar"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Falha ao definir hora de modificação"
@@ -1797,7 +1834,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1820,7 +1857,7 @@ msgstr "Transferência de dados falhou, servidor respondeu '%s'"
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Impossível invocar "
@@ -1849,75 +1886,79 @@ msgstr "Não posso iniciar a conexão para %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível conectar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falaha temporária resolvendo '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Não foi possível resolver '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saíndo."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Erro interno : Assintura boa, mas não foi possível determinar a impressão "
+"digital da chave ?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Ao menos uma assinatura inválida foi encontrada."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Não foi possível obter trava %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " ao verificar assinatura (o gnupg está instalado ?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Os pacotes extra a seguir serão instalados:"
+msgstr "As seguintes assinaturas foram inválidas :\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"As assinaturas a seguir não puderam ser verificadas devido a chave pública "
+"não estar disponível :\n"
#: methods/gzip.cc:57
#, c-format
@@ -1929,76 +1970,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range quebrado"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Seleção falhou."
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de saída"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor Ponto remoto fechou a conexão"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Conexão falhou."
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erro interno"
@@ -2011,7 +2052,7 @@ msgstr "Não foi possível fazer mmap de arquivo vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -2134,7 +2175,7 @@ msgstr "Operação %s inválida"
msgid "Unable to stat the mount point %s"
msgstr "Impossível checar o ponto de montagem %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossível mudar para %s"
@@ -2279,74 +2320,89 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Construindo Árvore de Dependências"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versões Candidatas"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Geração de Dependência"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Mesclando informação Disponível"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao gravar arquivo %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossível analizar arquivo de pacote %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossível analizar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha malformada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha malformada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha malformada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha malformada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na sources.lits %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
@@ -2368,7 +2424,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo de arquivo de índice '%s' não é suportado"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2376,7 +2432,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2384,7 +2440,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
@@ -2398,10 +2454,17 @@ msgstr "Diretório de listas %spartial está faltando."
msgid "Archive directory %spartial is missing."
msgstr "Diretório de repositório %spartial está faltando."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Fazendo o download do arquivo %li de %li (%s restantes)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lendo Listagem de Pacotes"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2413,20 +2476,18 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Troca de mídia: Por favor insira o disco nomeado\n"
-" '%s'\n"
-"no drive '%s' e pressione enter\n"
+"Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável."
@@ -2464,86 +2525,86 @@ msgstr "Naõ foi possível entender o tipo de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para pinagem"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "O Cache possui um sistema de versões incompatível"
-#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu processando %s (NovoPacote)"
-#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu processando %s (UsePacote1)"
-#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu processando %s (UsePacote2)"
-#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
-#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu processando %s (NovaVersão1)"
-#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu processando %s (UsePacote3)"
-#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu processando %s (NovaVersão2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Ops, você excedeu o número de nomes de pacotes que este APT é capaz de "
"suportar."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Ops, você excedeu o número de versões que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Ops, você excedeu o número de dependências que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Um erro ocorreu processando %s (FindPkg)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Um erro ocorreu processando %s (CollectFileProvides)"
+msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pacote %s %s não foi encontrado processando dependências de arquivo"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível checar a lista de pacotes fonte %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Coletando File Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar cache fonte"
@@ -2552,11 +2613,15 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Não existem chaves públicas para os seguintes IDs de chaves :\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2566,7 +2631,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2575,7 +2640,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2583,7 +2648,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2691,59 +2756,74 @@ msgstr ""
"combinam\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "Preparando %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "Desempacotando %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abrindo arquivo de configuração %s"
+msgstr "Preparando para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalado: "
+msgstr "%s instalado"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparando para a remoção de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "Removendo %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomenda"
+msgstr "%s removido"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparando para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Falha ao remover %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexão encerrada prematuramente"
+#~ msgid "File date has changed %s"
+#~ msgstr "Data do arquivo mudou %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Listagem de Pacotes"
+
+#~ msgid "Could not execute "
+#~ msgstr "Não foi possível executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparando para remoção de %s e sua configuração"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s e sua configuração removidos"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
@@ -2796,12 +2876,6 @@ msgstr "Conexão encerrada prematuramente"
#~ msgstr "Falha ao baixar %s %s\n"
#, fuzzy
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e "
-#~ "pressione enter\n"
-
-#, fuzzy
#~ msgid "Couldn't wait for subprocess"
#~ msgstr "Não foi possível checar a lista de pacotes fonte %s"
diff --git a/po/ro.po b/po/ro.po
index d2f9e1360..1517414df 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,19 +1,19 @@
# translation of apt_ro.po to Romanian
# This file is put in the public domain.
-# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005.
+# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-08-25 17:43+0300\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-06-25 12:58+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
-"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:135
@@ -147,14 +147,14 @@ msgstr " Tabela de versiuni:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pentru %s %s compilat pe %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,19 @@ msgstr ""
" -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
"Vedeţi manualele apt-cache(8) şi apt.conf(5) pentru mai multe informaţii.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repetaţi această procedură pentru restul CD-urilor."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumentele nu sunt perechi"
@@ -290,7 +303,7 @@ 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-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Nu pot scrie în %s"
@@ -420,115 +433,126 @@ msgstr "Nu s-a potrivit nici o selecţie"
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:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB este vechi, se încearcă înnoirea %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nu pot deschide fiÅŸierul DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Data fişierului a fost modificată %s"
+msgid "Failed to stat %s"
+msgstr "Eşuare în determinarea stării %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiva nu are înregistrare de control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nu pot obţine un cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nu pot citi directorul %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nu pot determina starea %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Erori la fiÅŸierul "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Eşuare în a rezolva %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Eşuare în parcurgerea arborelui"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "EÅŸuare la deschiderea %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Dezlegare %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Eşuare la citirea legăturii %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Eşuare în desfacerea legăturii %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Eşuare în legarea %s de %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Eşuare în determinarea stării %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nu are intrare de înlocuire\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nu are intrare de înlocuire\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -624,258 +648,257 @@ msgstr "Problemă la desfacerea %s"
msgid "Failed to rename %s to %s"
msgstr "Eşuare în a redenumi %s în %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Următoarele pachete au dependenţe neîndeplinite:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " sau"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ŞTERSE:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reţinute:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ţinute vor fi schimbate:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
+"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
"Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de şters şi %lu neînnoite.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau ÅŸterse incomplet.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Corectez dependenţele..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " eÅŸuare."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Nu pot corecta dependenţele"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Nu pot micşora mulţimea pachetelor de înnoire"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Terminat"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Avertisment de autentificare înlocuit.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Instalaţi aceste pachete fără verificare [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Unele pachete n-au putut fi autentificate"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Eroare internă în timpul adăugării unei diversiuni"
+msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Este nevoie să descărcaţi %sB de arhive.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Nu aveţi suficient spaţiu în %s"
+msgstr "N-am putut determina spaţiul disponibil în %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nu aveţi suficient spaţiu în %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Sunteţi pe cale de a face ceva cu potenţial distructiv\n"
+"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n"
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Renunţare."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -883,47 +906,47 @@ msgstr ""
"Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --"
"fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Nu pot corecta pachetele lipsă."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Abandonez instalarea."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Instalat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -934,49 +957,49 @@ msgstr ""
"Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n"
"este disponibil numai din altă sursă\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Oricum următoarele pachete îl înlocuiesc:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pachetul %s nu are nici un candidat la instalare"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -984,25 +1007,45 @@ msgstr ""
"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au "
"fost folosite în loc unele vechi."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1010,7 +1053,7 @@ msgstr ""
"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
"(sau oferiţi o altă soluţie)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1023,7 +1066,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1033,117 +1076,118 @@ msgstr ""
" că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n"
"acest pachet ar trebui completat."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "EÅŸuare"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+msgstr ""
+"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu pot găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Sar peste fişierul deja descărcat '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, 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"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, 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:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "EÅŸuare proces copil"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1196,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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1205,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, 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:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1372,19 +1416,19 @@ msgstr "Unirea informaţiilor disponibile"
msgid "Failed to create pipes"
msgstr "Eşuare în crearea conexiunilor"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Eşuare în executarea gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arhivă deteriorată"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Eşuarea sumei de control în arhiva tar, arhivă deteriorată"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tip antet TAR %u necunoscut, membru %s"
@@ -1441,11 +1485,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "FiÅŸier de configurare duplicat %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Eşuare în a scrie fişierul %s"
+msgstr "Eşuare în scrierea fişierului %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Eşuare în a închide fişierul %s"
@@ -1498,7 +1542,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "FiÅŸierul %s/%s suprascrie pe cel din pachetul %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nu pot citi %s"
@@ -1530,9 +1575,9 @@ msgstr ""
"fiÅŸiere"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Citire liste de pachete"
@@ -1546,7 +1591,7 @@ msgstr "Eşuare în a schimba către directorul %sinfo"
msgid "Internal error getting a package name"
msgstr "Eroare internă la preluarea numelui de pachet"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Citire derulare fiÅŸier"
@@ -1590,14 +1635,9 @@ msgid "Internal error adding a diversion"
msgstr "Eroare internă în timpul adăugării unei diversiuni"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "Cache-ul pachetului trebuie întâi iniţializat"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Citirea listei de fiÅŸiere"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1663,20 +1703,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fişier negăsit"
+msgstr "Disc negăsit."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fişier negăsit"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Eşuare de determinare a stării"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "EÅŸuare la ajustarea timpului"
@@ -1804,7 +1843,7 @@ msgstr "Timp de conectare data socket expirat"
msgid "Unable to accept connection"
msgstr "Nu pot accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1827,7 +1866,7 @@ msgstr "EÅŸuare transfer de date, serverul a spus: '%s'"
msgid "Query"
msgstr "Interogare"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Nu pot invoca"
@@ -1856,75 +1895,79 @@ msgstr "Nu pot iniţia conectarea la %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "N-am putut conecta la %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectare la %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nu pot rezolva '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Eşuare temporară în rezolvarea '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Nu pot conecta la %s %s"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nu pot accesa keyring: '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia "
+"amprentei digitale?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nu pot determina blocajul %s"
+msgstr "Cel puţin o semnătură invalidă a fost întâlnită."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
+"Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Următoarele extra pachete vor fi instalate:"
+msgstr "Următoarele semnături au fost invalide:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Următoarele semnături n-au putut fi verificate datorită cheii publice care "
+"este indisponibilă:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1936,77 +1979,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "ÃŽn aÅŸteptarea antetelor"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Eroare la scrierea fiÅŸierului de rezultat"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Eroare internă"
@@ -2019,7 +2062,7 @@ msgstr "Nu pot mmap un fiÅŸier gol"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu pot face mmap la %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selecţia %s nu s-a găsit"
@@ -2142,7 +2185,7 @@ msgstr "Operaţiune invalidă %s"
msgid "Unable to stat the mount point %s"
msgstr "Nu pot determina starea punctului de montare %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nu pot schimba la %s"
@@ -2287,74 +2330,89 @@ msgstr "opţional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Se construieşte arborele de dependenţă"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Versiuni candidat"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generare dependenţe"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Unirea informaţiilor disponibile"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "EÅŸuare la deschiderea %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eşuare în scrierea fişierului %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nu pot analiza fiÅŸierul pachet %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nu pot analiza fiÅŸierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greşită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greşită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greşită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greşită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)"
@@ -2376,14 +2434,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipul de fiÅŸier index '%s' nu este suportat"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2391,7 +2449,7 @@ msgstr ""
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ţinute."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
@@ -2405,10 +2463,17 @@ msgstr "Directorul de liste %spartial lipseÅŸte."
msgid "Archive directory %spartial is missing."
msgstr "Directorul de arhive %spartial lipseÅŸte."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Se descarcă fişierul %li din %li (%s rămas)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Se descarcă fişierul %li din %li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2420,20 +2485,18 @@ msgstr "Metoda driver %s nu poate fi găsită."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nu s-a lansat corect"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Schimbare de mediu: Vă rog introduceţi discul numit\n"
-" '%s'\n"
-"în unitatea '%s' şi apăsaţi Enter\n"
+"Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu pot determina un tip de sistem de pachete potrivit"
@@ -2470,87 +2533,87 @@ msgstr "Nu s-a înţeles tipul de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cache are un versioning system incompatibil"
-#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Eroare în timpul procesării %s (Pachet Nou)"
+msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Eroare în timpul procesării %s (UsePackage1)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Eroare în timpul procesării %s (UsePackage2)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Eroare în timpul procesării %s (NewFileVer1)"
+msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Eroare în timpul procesării %s (NewVersion1)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Eroare în timpul procesării %s (UsePackage3)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Eroare în timpul procesării %s (NewVersion2)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest "
"APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
-#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Eroare în timpul procesării %s (FindPkg)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Eroare în timpul procesării %s (CollectFileProvides)"
+msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Colectare furnizori fiÅŸier"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
@@ -2559,11 +2622,17 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Nu există nici o cheie publică disponibilă pentru următoarele "
+"identificatoare de chei:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2572,7 +2641,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2581,7 +2650,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2589,7 +2658,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2694,55 +2763,58 @@ msgstr ""
"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Deschidere %s"
+msgstr "Se pregăteşte %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Deschidere %s"
+msgstr "Se despachetează %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Deschidere fiÅŸier de configurare %s"
+msgstr "Se pregăteşte configurarea %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectare la %s"
+msgstr "Se configurează %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalat: "
+msgstr "Instalat %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Se pregăteşte ştergerea lui %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Deschidere %s"
+msgstr "Se ÅŸterge %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomandă"
+msgstr "Åžters %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Se pregăteşte ştergerea completă a %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Åžters complet %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexiune închisă prematur"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Data fişierului a fost modificată %s"
diff --git a/po/ru.po b/po/ru.po
index 0c82a07d3..8b94c86ca 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,4 @@
-# translation of apt-ru.po to Russian
# translation of apt_po_ru.po to Russian
-# translation of apt_ru.po to Russian
-# translation of apt_ru.po to РуÑÑкий Ñзык
-# translation of ru.po to Russian
# Russian messages for the apt suite.
# Vadim Kutchin <amadis@chemi.komisc.ru>, 2002.
# Ilgiz Kalmetev <ilgiz@bashtelecom.ru>, 2002.
@@ -10,20 +6,20 @@
# Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
# Dmitry Astapov <adept@umc.com.ua>, 2004.
# Dmitry Astapov <adept@despammed.com>, 2004.
-# Yuri Kozlov <yuray@id.ru>, 2004, 2005.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-ru\n"
+"Project-Id-Version: apt_po_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-09 19:50+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-01-21 14:55+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -159,14 +155,14 @@ msgstr " Таблица верÑий:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s Ð´Ð»Ñ %s %s Ñкомпилирован %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -239,6 +235,18 @@ msgstr ""
"tmp\n"
"ПодробноÑти в Ñтраницах руководÑтва apt-cache(8) и apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Задайте Ð¸Ð¼Ñ Ð´Ð»Ñ Ñтого диÑка, например 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Ð’Ñтавьте диÑк в уÑтройÑтво и нажмите ввод"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Повторите Ñтот процеÑÑ Ð´Ð»Ñ Ð²Ñех имеющихÑÑ CD."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Ðепарные аргументы"
@@ -291,7 +299,7 @@ msgid ""
msgstr ""
"ИÑпользование: apt-extracttemplates file1 [file2 ...]\n"
"\n"
-"apt-extracttemplates извлекает из пакетов Дебиан конфигурационные Ñкрипты\n"
+"apt-extracttemplates извлекает из пакетов Debian конфигурационные Ñкрипты\n"
"и файлы-шаблоны\n"
"\n"
"Опции:\n"
@@ -300,7 +308,7 @@ msgstr ""
" -c=? Читать указанный конфигурационный файл\n"
" -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ðевозможно запиÑать в %s"
@@ -337,7 +345,6 @@ msgid "Error processing contents %s"
msgstr "ошибка обработки полного Ð¿ÐµÑ€ÐµÑ‡Ð½Ñ Ñодержимого пакетов (Contents) %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -378,7 +385,7 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"ИÑпользование: apt-ftparchive [options] command\n"
+"ИÑпользование: apt-ftparchive [параметры] команда\n"
"Команды: packages binarypath [overridefile [pathprefix]]\n"
" sources srcpath [overridefile [pathprefix]]\n"
" contents path\n"
@@ -387,35 +394,33 @@ msgstr ""
" clean config\n"
"\n"
"apt-ftparchive генерирует индекÑные файлы архивов Debian. Он поддерживает\n"
-"множеÑтво Ñтилей генерации: от полноÑтью автоматичеÑкой до замены функций\n"
-"пакетов dpkg-scanpackages и dpkg-scansources\n"
+"множеÑтво Ñтилей генерации: от полноÑтью автоматичеÑкого до функциональной "
+"замены\n"
+"программ dpkg-scanpackages и dpkg-scansources\n"
"\n"
"apt-ftparchive генерирует файлы Package (ÑпиÑки пакетов) Ð´Ð»Ñ Ð´ÐµÑ€ÐµÐ²Ð°\n"
-"каталогов, Ñодержащих файлы .deb. Файл Package\n"
-"включает в ÑÐµÐ±Ñ Ð²Ñе управлÑющие запиÑи вÑех пакетов. Кроме того, Ð´Ð»Ñ "
-"каждого\n"
-"пакета указывает Ñ…Ñш MD5 и размер файла. Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющих запиÑей\n"
-"\"приоритет\" (Priority) и \"ÑекциÑ\" (Section) могут быть изменены путём\n"
-"ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° переназначений (override)\n"
+"каталогов, Ñодержащих файлы .deb. Файл Package включает в ÑÐµÐ±Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющие\n"
+"Ð¿Ð¾Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ пакета, а также хеш MD5 и размер файла. Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющих\n"
+"полей \"приоритет\" (Priority) и \"ÑекциÑ\" (Section) могут быть изменены Ñ\n"
+"помощью файла override.\n"
"\n"
"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n"
-"каталогов, Ñодержащих файлы .dsc.\n"
-"Ð”Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° override в Ñтом режиме можно иÑпользовать\n"
-"опцию --source-override.\n"
+"каталогов, Ñодержащих файлы .dsc. Ð”Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° override в Ñтом \n"
+"режиме можно иÑпользовать параметр --source-override.\n"
"\n"
"Команды 'packages' и 'sources' надо выполнÑÑ‚ÑŒ, находÑÑÑŒ в корневом каталоге\n"
"дерева, которое вы хотите обработать. BinaryPath должен указывать на меÑто,\n"
"Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ начинаетÑÑ Ñ€ÐµÐºÑƒÑ€Ñивный обход, а файл переназначений (override)\n"
"должен Ñодержать запиÑи о переназначениÑÑ… управлÑющих полей. ЕÑли был "
"указан\n"
-"Pathprefix, то его значениt добавлÑетÑÑ Ðº управлÑющим полÑм, Ñодержащим\n"
+"Pathprefix, то его значение добавлÑетÑÑ Ðº управлÑющим полÑм, Ñодержащим\n"
"имена файлов. Пример иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð° Debian:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
-"Опции:\n"
+"Параметры:\n"
" -h Этот текÑÑ‚\n"
-" --md5 Управление генерацией MD5-Ñ…Ñшей\n"
+" --md5 Управление генерацией MD5-хешей\n"
" -s=? Указать файл переназначений (override) Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ñ Ð¸Ñходными "
"текÑтами\n"
" -q Ðе выводить ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² процеÑÑе работы\n"
@@ -424,7 +429,7 @@ msgstr ""
" --contents Управление генерацией полного Ð¿ÐµÑ€ÐµÑ‡Ð½Ñ Ñодержимого пакетов\n"
" (файла Contents)\n"
" -c=? ИÑпользовать указанный конфигурационный файл\n"
-" -o=? Указать произвольную опцию"
+" -o=? Указать произвольный параметр конфигурации"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
@@ -435,115 +440,126 @@ msgstr "Совпадений не обнаружено"
msgid "Some files are missing in the package file group `%s'"
msgstr "Ð’ группе пакетов `%s' отÑутÑтвуют некоторые файлы"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "БД была повреждена, файл переименован в %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB уÑтарела, попытка обновить %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ðе удалоÑÑŒ открыть DB файл %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Дата файла %s изменилаÑÑŒ"
+msgid "Failed to stat %s"
+msgstr "Ðе удалоÑÑŒ получить атрибуты %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Ð’ архиве нет Ð¿Ð¾Ð»Ñ control"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ðевозможно получить курÑор"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Ðе удалоÑÑŒ прочитать каталог %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Ðе удалоÑÑŒ прочитать атрибуты %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Ошибки отноÑÑÑ‚ÑÑ Ðº файлу '"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Ðе удалоÑÑŒ проÑледовать по ÑÑылке %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Ðе удалоÑÑŒ Ñовершить обход дерева"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Ðе удалоÑÑŒ открыть %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ ÑÑылку %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Ðе удалоÑÑŒ удалить %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ðе удалоÑÑŒ Ñоздать ÑÑылку %s на %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Ðе удалоÑÑŒ получить атрибуты %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Ð’ архиве нет Ð¿Ð¾Ð»Ñ package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " Ðет запиÑи о переназначении (override) Ð´Ð»Ñ %s\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s Ñопровождает %s, а не %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " Ðет запиÑи о переназначении (override) Ð´Ð»Ñ %s\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " Ðет запиÑи о переназначении (override) Ð´Ð»Ñ %s\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -640,264 +656,264 @@ msgstr "Ðе удалоÑÑŒ удалить %s"
msgid "Failed to rename %s to %s"
msgstr "Ðе удалоÑÑŒ переименовать %s в %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компилÑции регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Пакеты, имеющие неудовлетворённые завиÑимоÑти:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "но %s уже уÑтановлен"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет уÑтановлен"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "но он не может быть уÑтановлен"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "но Ñто виртуальный пакет"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "но он не уÑтановлен"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "но он не будет уÑтановлен"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " или"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "ÐОВЫЕ пакеты, которые будут уÑтановлены:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДÐЛЕÐЫ:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оÑтавлены в неизменном виде:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТÐРЫЕ верÑии:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы оÑтатьÑÑ Ð±ÐµÐ· изменений, но будут заменены:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вÑледÑтвие %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"Ð’ÐИМÐÐИЕ: Эти ÑущеÑтвенно важные пакеты будут удалены\n"
+"Ð’ÐИМÐÐИЕ: Эти ÑущеÑтвенно важные пакеты будут удалены.\n"
"ÐЕ ДЕЛÐЙТЕ Ñтого, еÑли вы ÐЕ предÑтавлÑете Ñебе вÑе возможные поÑледÑтвиÑ!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, уÑтановлено %lu новых пакетов, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "переуÑтановлено %lu переуÑтановлено, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на Ñтарые верÑии, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð¾ %lu пакетов, и %lu пакетов не обновлено.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не уÑтановлено до конца или удалено %lu пакетов.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "ИÑправление завиÑимоÑтей..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " не удалоÑÑŒ."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ðевозможно Ñкорректировать завиÑимоÑти"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ðевозможно минимизировать набор обновлений"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Готово"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Возможно, Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтих ошибок вы захотите воÑпользоватьÑÑ `apt-get -"
"f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Ðеудовлетворённые завиÑимоÑти. ПопытайтеÑÑŒ иÑпользовать -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Ð’ÐИМÐÐИЕ: Следующие пакеты невозможно аутентифицировать!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ðутентификационное предупреждение не принÑто в внимание.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "УÑтановить Ñти пакеты без проверки [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Ðекоторые пакеты невозможно аутентифицировать"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "СущеÑтвуют проблемы, а Ð¾Ð¿Ñ†Ð¸Ñ -y иÑпользована без --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
+"ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, InstallPackages была вызвана Ñ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑпоÑобными "
+"пакетами!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при добавлении diversion"
+msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, Ordering не завершилаÑÑŒ"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ðевозможно заблокировать каталог Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ðе читаетÑÑ Ð¿ÐµÑ€ÐµÑ‡ÐµÐ½ÑŒ иÑточников."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Странно.. ÐеÑовпадение размеров, напишите на apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Ðеобходимо Ñкачать %sB/%sB архивов.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Ðеобходимо Ñкачать %sБ архивов.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"ПоÑле раÑпаковки объем занÑтого диÑкового проÑтранÑтва возраÑÑ‚Ñ‘Ñ‚ на %sB.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"ПоÑле раÑпаковки объем занÑтого диÑкового проÑтранÑтва уменьшитÑÑ Ð½Ð° %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "ÐедоÑтаточно меÑта в %s"
+msgstr "Ðе удалоÑÑŒ определить количеÑтво Ñвободного меÑта в %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "ÐедоÑтаточно Ñвободного меÑта в %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Запрошено выполнение только тривиальных операций, но Ñто не Ñ‚Ñ€Ð¸Ð²Ð¸Ð°Ð»ÑŒÐ½Ð°Ñ "
"операциÑ."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Да, делать, как Ñ Ñкажу!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"То, что вы хотите Ñделать, может иметь нежелательные поÑледÑтвиÑ\n"
+"То, что вы хотите Ñделать, может иметь нежелательные поÑледÑтвиÑ.\n"
"Чтобы продолжить, введите фразу: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Ðварийное завершение."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ðе удалоÑÑŒ загрузить %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Ðекоторые файлы не удалоÑÑŒ загрузить"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -905,48 +921,48 @@ msgstr ""
"Ðевозможно загрузить некоторые архивы, вероÑтно надо запуÑтить apt-get "
"update или попытатьÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ запуÑк Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ --fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing и Ñмена ноÑÐ¸Ñ‚ÐµÐ»Ñ Ð² данный момент не поддерживаютÑÑ"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Ðевозможно иÑправить Ñитуацию Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ð¼Ð¸ пакетами."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Ðварийное завершение уÑтановки."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Заметьте, вмеÑто %2$s выбираетÑÑ %1$s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"ПропуÑкаетÑÑ %s - пакет уже уÑтановлен, и Ð¾Ð¿Ñ†Ð¸Ñ upgrade не уÑтановлена.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Пакет %s не уÑтановлен, поÑтому не может быть удалён\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Пакет %s - виртуальный, его функции предоÑтавлÑÑŽÑ‚ÑÑ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼Ð¸:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [УÑтановлен]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Ð’Ñ‹ должны Ñвно указать, какой именно вы хотите уÑтановить."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -957,49 +973,49 @@ msgstr ""
"Это может означать, что пакет отÑутÑтвует, уÑтарел, или доÑтупен из "
"иÑточников, не упомÑнутых в sources.list\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Однако Ñледующие пакеты могут его заменить:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Ð”Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s не найдены кандидаты на уÑтановку"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ПереуÑтановка %s невозможна, он не загружаетÑÑ.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Уже уÑтановлена ÑÐ°Ð¼Ð°Ñ Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ %s.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Релиз '%s' Ð´Ð»Ñ '%s' не найден"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "ВерÑÐ¸Ñ '%s' Ð´Ð»Ñ '%s' не найдена"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана верÑÐ¸Ñ %s (%s) Ð´Ð»Ñ %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Ðевозможно заблокировать каталог Ñо ÑпиÑками пакетов"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1007,27 +1023,46 @@ msgstr ""
"Ðекоторые индекÑные файлы не загрузилиÑÑŒ, они были проигнорированы или "
"вмеÑто них были иÑпользованы Ñтарые верÑии"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ поможет Вам:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, решатель проблем вÑÑ‘ поломал"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, AllUpgrade вÑе поломал"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Ðе могу найти пакет %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулÑрное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, длÑ иÑправлениÑ Ñтих ошибок вы захотите воÑпользоватьÑÑ `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1035,7 +1070,7 @@ msgstr ""
"Ðеудовлетворённые завиÑимоÑти. ПопытайтеÑÑŒ выполнить 'apt-get -f install', "
"не ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸ пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1046,7 +1081,7 @@ msgstr ""
"или же иÑпользуете неÑтабильного диÑтрибутив, и запрошенные Вами пакеты\n"
"ещё не Ñозданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1056,121 +1091,121 @@ msgstr ""
"пакет проÑто не может быть уÑтановлен из-за ошибок в Ñамом пакете.\n"
"Ðеобходимо поÑлать отчёт об Ñтой ошибке."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ поможет Вам:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Будут уÑтановлены Ñледующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
-msgstr "ÐаÑтойчиво рекомендуемые пакеты:"
+msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr "РаÑÑчёт обновлений... "
+msgstr "РаÑчёт обновлений... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ðеудачно"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, AllUpgrade вÑе поломал"
+msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, решатель проблем вÑÑ‘ поломал"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ необходимо загрузить иÑходные "
"текÑÑ‚Ñ‹"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ðевозможно найти пакет Ñ Ð¸Ñходными текÑтами Ð´Ð»Ñ %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ПропуÑкаем уже загруженный файл '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ÐедоÑтаточно меÑта в %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ðеобходимо загрузить %sB/%sB из архивов иÑходных текÑтов.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ðужно загрузить %sB архивов Ñ Ð¸Ñходными текÑтами.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка иÑходных текÑтов %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Ðекоторые архивы не удалоÑÑŒ загрузить."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"РаÑпаковка иÑходных текÑтов пропущена, так как в %s уже находÑÑ‚ÑÑ "
"раÑпакованные иÑходные текÑÑ‚Ñ‹\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда раÑпаковки '%s' завершилаÑÑŒ неудачно.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Проверьте, уÑтановлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда Ñборки '%s' завершилаÑÑŒ неудачно.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Порождённый процеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ завиÑимоÑтей Ð´Ð»Ñ Ñборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ðевозможно получить информацию о завиÑимоÑÑ‚ÑÑ… Ð´Ð»Ñ Ñборки %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет завиÑимоÑтей Ð´Ð»Ñ Ñборки.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,7 +1214,7 @@ msgstr ""
"ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,32 +1223,32 @@ msgstr ""
"ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, поÑкольку ни одна из "
"верÑий пакета %s не удовлетворÑет требованиÑм"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ðе удалоÑÑŒ удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: УÑтановленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ðевозможно удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ЗавиÑимоÑти Ð´Ð»Ñ Ñборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Обработка завиÑимоÑтей Ð´Ð»Ñ Ñборки завершилаÑÑŒ неудачно"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1396,19 +1431,19 @@ msgstr "Объединение информации о доÑтупных пак
msgid "Failed to create pipes"
msgstr "Ðе удалоÑÑŒ Ñоздать порождённые процеÑÑÑ‹"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Ðе удалоÑÑŒ выполнить gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Повреждённый архив"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма Tar, архив повреждён"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "ÐеизвеÑтный заголовок в архиве TAR. Тип %u, Ñлемент %s"
@@ -1465,11 +1500,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Повторно указанный конфигурационный файл %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Ðе удалоÑÑŒ запиÑать файл %s"
+msgstr "Ðе удалоÑÑŒ запиÑать в файл %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ðе удалоÑÑŒ закрыть файл %s"
@@ -1522,7 +1557,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s перепиÑывает файл в пакете %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ðевозможно прочитать %s"
@@ -1552,9 +1588,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Каталоги info и temp должны находитьÑÑ Ð½Ð° одной файловой ÑиÑтеме"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Чтение ÑпиÑков пакетов"
@@ -1568,7 +1604,7 @@ msgstr "Ðе удалоÑÑŒ Ñменить текущий каталог на а
msgid "Internal error getting a package name"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при получении имени пакета"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Чтение ÑпиÑков файлов в пакете"
@@ -1614,10 +1650,6 @@ msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при добавлении diversion"
msgid "The pkg cache must be initialized first"
msgstr "Ð’ первую очередь должен быть проинициализирован кÑш пакетов"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Чтение ÑпиÑка файлов в пакете"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1683,20 +1715,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Ðевозможно размонтировать CD-ROM в %s, возможно он ещё иÑпользуетÑÑ."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Файл не найден"
+msgstr "ДиÑк не найден."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Файл не найден"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Ðе удалоÑÑŒ получить атрибуты"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Ðе удалоÑÑŒ уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
@@ -1828,7 +1859,7 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñоке
msgid "Unable to accept connection"
msgstr "Ðевозможно принÑÑ‚ÑŒ Ñоединение"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при Ñ…Ñшировании файла"
@@ -1851,7 +1882,7 @@ msgstr "Передача данных завершилаÑÑŒ неудачно, Ñ
msgid "Query"
msgstr "ЗапроÑ"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Ðевозможно вызвать "
@@ -1880,157 +1911,161 @@ msgstr "Ðевозможно инициализировать Ñоединени
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Ðе удаётÑÑ ÑоединитьÑÑ Ñ %s:%s (%s), connection timed out"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ðе удаётÑÑ ÑоединитьÑÑ Ñ %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Соединение Ñ %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ðе могу найти IP Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ %s"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при попытке получить IP Ð°Ð´Ñ€ÐµÑ '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
"Что-то Ñтранное произошло при попытке получить IP Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Ðевозможно ÑоединитьÑÑ Ñ %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Ðе могу найти IP Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ %s"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Слишком большой ÑпиÑок параметров у Acquire::gpgv::Options. Завершение "
+"работы."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: ÐŸÑ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ, но не удалоÑÑŒ определить отпечаток "
+"ключа?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Ðе могу получить доÑтуп к файлу блокировки %s"
+msgstr "Ðайдена как минимум одна Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ подпиÑи (gnupg уÑтановлена?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при выполнении gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Будут уÑтановлены Ñледующие дополнительные пакеты:"
+msgstr "Следующие подпиÑи неверные:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Следующие подпиÑи не могут быть проверены, так как недоÑтупен общий ключ:\n"
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Ðе могу породить процеÑÑ %s"
+msgstr "Ðе удалоÑÑŒ открыть канал Ð´Ð»Ñ %s"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· процеÑÑа %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u Ñимволов"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ðеверный заголовок"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-Ñервер поÑлал неверный заголовок"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http Ñервер поÑлал неверный заголовок Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-Ñервер поÑлал неверный заголовок Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Этот http-Ñервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "ÐеизвеÑтный формат данных"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Ошибка запиÑи в выходной файл"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Ошибка запиÑи в файл"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Ошибка запиÑи в файл"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтениÑ, удалённый Ñервер прервал Ñоединение"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ Ñервера"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ðеверный заголовок данных"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
@@ -2043,7 +2078,7 @@ msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ пуÑтой Ñ
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ %lu байт"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Ðе найдено: %s"
@@ -2166,7 +2201,7 @@ msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
msgid "Unable to stat the mount point %s"
msgstr "Ðевозможно прочитать атрибуты точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ðевозможно Ñменить текущий каталог на %s"
@@ -2279,7 +2314,7 @@ msgstr "ПредЗавиÑит"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr "ÐаÑтойчиво рекомендует"
+msgstr "Предлагает"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
@@ -2317,75 +2352,90 @@ msgstr "необÑзательный"
msgid "extra"
msgstr "дополнительный"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "ПоÑтроение дерева завиÑимоÑтей"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "ВерÑии-кандидаты"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Генерирование завиÑимоÑтей"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Объединение информации о доÑтупных пакетах"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ðе удалоÑÑŒ открыть %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ðе удалоÑÑŒ запиÑать в файл %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ðевозможно прочеÑÑ‚ÑŒ Ñодержимое пакета %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ðевозможно прочеÑÑ‚ÑŒ Ñодержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (проблема в имени диÑтрибутива)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в ÑпиÑке иÑточников %s Ñлишком длинна."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %u в ÑпиÑке иÑточников %s (тип)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ÐеизвеÑтен тип '%s' в Ñтроке %u в ÑпиÑке иÑточников %s"
+msgstr "ÐеизвеÑтный тип '%s' в Ñтроке %u в ÑпиÑке иÑточников %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %u в ÑпиÑке иÑточников %s (vendor id)"
@@ -2407,13 +2457,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ðе поддерживаетÑÑ Ð¸Ð½Ð´ÐµÐºÑный файл типа '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Пакет %s нуждаетÑÑ Ð² переуÑтановке, но Ñ Ð½Ðµ могу найти архив Ð´Ð»Ñ Ð½ÐµÐ³Ð¾."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2421,7 +2471,7 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve Ñгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ðевозможно иÑправить ошибки, у Ð’Ð°Ñ Ð¾Ñ‚Ð»Ð¾Ð¶ÐµÐ½Ñ‹ (held) битые пакеты."
@@ -2435,10 +2485,17 @@ msgstr "Каталог %spartial отÑутÑтвует."
msgid "Archive directory %spartial is missing."
msgstr "Ðрхивный каталог %spartial отÑутÑтвует."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ЗагружаетÑÑ Ñ„Ð°Ð¹Ð» %li из %li (%s оÑталоÑÑŒ)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Чтение ÑпиÑков файлов в пакете"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2450,19 +2507,17 @@ msgstr "Драйвер Ð´Ð»Ñ Ð¼ÐµÑ‚Ð¾Ð´Ð° %s не найден."
msgid "Method %s did not start correctly"
msgstr "Метод %s запуÑтилÑÑ Ð½Ðµ корректно"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Смена ноÑителÑ: вÑтавьте диÑк Ñ Ð¼ÐµÑ‚ÐºÐ¾Ð¹ '%s' в уÑтройÑтво '%s' и нажмите "
-"ввод\n"
+msgstr "Ð’Ñтавьте диÑк Ñ Ð¼ÐµÑ‚ÐºÐ¾Ð¹ '%s' в уÑтройÑтво '%s' и нажмите ввод."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Менеджер пакетов '%s' не поддерживаетÑÑ"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Ðевозможно определить подходÑщий тип менеджера пакетов"
@@ -2496,82 +2551,82 @@ msgstr "ÐеизвеÑтный тип фикÑации %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ð”Ð»Ñ Ñ„Ð¸ÐºÑации не указан приоритет (или указан нулевой)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "КÑш имеет неÑовмеÑтимую ÑиÑтему верÑий"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Превышено допуÑтимое количеÑтво имён пакетов."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Превышено допуÑтимое количеÑтво верÑий."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Превышено допуÑтимое количеÑтво завиÑимоÑтей."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Произошла ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ файла завиÑимоÑтей не найден пакет %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ðе удалоÑÑŒ получить атрибуты ÑпиÑка пакетов Ñ Ð¸Ñходными текÑтами %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке Ñохранить кÑш иÑходных текÑтов"
@@ -2580,11 +2635,15 @@ msgstr "Ошибка ввода/вывода при попытке ÑохранÐ
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалоÑÑŒ, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5Sum не Ñовпадает"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "ÐедоÑтупен общий ключ Ð´Ð»Ñ Ñледующих ключей (ID):\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2593,7 +2652,7 @@ msgstr ""
"Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам "
"придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2602,13 +2661,13 @@ msgstr ""
"Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам "
"придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Ðекорректный перечень пакетов. Ðет Ð¿Ð¾Ð»Ñ Filename: Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Ðе Ñовпадает размер"
@@ -2713,58 +2772,73 @@ msgstr "Сохранено %i запиÑей Ñ %i неÑовпадающими
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Сохранено %i запиÑей Ñ %i отÑутÑтвующими файлами и Ñ %i неÑовпадающими "
-"файлами.\n"
+"файлами\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Открытие %s"
+msgstr "ПодготавливаетÑÑ %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Открытие %s"
+msgstr "РаÑпаковываетÑÑ %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Открытие файла конфигурации %s"
+msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Соединение Ñ %s"
+msgstr "ÐаÑтройка %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " УÑтановлен: "
+msgstr "УÑтановлен %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Открытие %s"
+msgstr "Удаление %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Рекомендует"
+msgstr "Удалён %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ðе удалоÑÑŒ удалить %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Дата файла %s изменилаÑÑŒ"
+
+#~ msgid "Reading file list"
+#~ msgstr "Чтение ÑпиÑка файлов в пакете"
+
+#~ msgid "Could not execute "
+#~ msgstr "Ðе удалоÑÑŒ выполнить "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑте Ñ Ð½Ð°Ñтройками %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Удалён вмеÑте Ñ Ð½Ð°Ñтройками %s"
diff --git a/po/sk.po b/po/sk.po
index 9348ea0e7..58308b78f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-07-01 09:34+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-29 15:33+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -146,14 +146,14 @@ msgstr " Tabuľka verzií:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -227,6 +227,18 @@ msgstr ""
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
"Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Zadajte názov tohto disku, napríklad 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Vložte disk do mechaniky a stlaÄte Enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Zopakujte tento proces pre všetky CD v sade diskov."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenty nie sú vo dvojiciach"
@@ -288,7 +300,7 @@ msgstr ""
" -c=? NaÄíta tento konfiguraÄný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -410,115 +422,126 @@ msgstr "Nevyhovel žiaden výber"
msgid "Some files are missing in the package file group `%s'"
msgstr "V balíkovom súbore skupiny `%s' chýbajú niektoré súbory"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, 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:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Nedá sa otvoriť DB súbor %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Dátum súboru sa zmenil %s"
+msgid "Failed to stat %s"
+msgstr "%s sa nedá vyhodnotiť"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archív nemá riadiaci záznam"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Adresár %s sa nedá ÄítaÅ¥\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s sa nedá vyhodnotiť\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Chyby sa týkajú súboru "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba pri zisťovaní %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Priechod stromom zlyhal"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "%s sa nedá otvoriť"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkovanie %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Linka %s sa nedá ÄítaÅ¥"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "%s sa nedá odlinkovať"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s sa nedá vyhodnotiť"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku pre override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nemá žiadnu položku pre override\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nemá žiadnu položku pre override\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -614,80 +637,79 @@ msgstr "Problém s odlinkovaním %s"
msgid "Failed to rename %s to %s"
msgstr "Premenovanie %s na %s zlyhalo"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " alebo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÃNIA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súÄasnej verzii:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -695,176 +717,177 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, Äo robíte, tak to NEROBTE!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových inštalovaných, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba ÄiastoÄne nainÅ¡talovaných alebo odstránených.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Opravujú sa závislosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " zlyhalo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Závislosti sa nedajú opraviť"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Sada pre aktualizáciu sa nedá minimalizovať"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Na opravu môžete spustiť `apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplnené závislosti. Skúste použiť -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Upozornenie o vierohodnosti bolo potlaÄené.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
-msgstr "Nedala sa zistiť vierohodnoť niektorých balíkov"
+msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Vnútorná chyba pri pridávaní diverzie"
+msgstr "Vnútorná chyba, Triedenie sa neukonÄilo"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nedá sa naÄítaÅ¥ zoznam zdrojov."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"NezvyÄajná udalosÅ¥... Veľkosti nesúhlasia, poÅ¡lite e-mail na apt@packages."
+"debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB archívov.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení sa na disku použije Äalších %sB.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Na %s nemáte dostatok voľného miesta"
+msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ãno, urob to, Äo vravím!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Možno sa chystáte vykonaÅ¥ nieÄo Å¡kodlivé\n"
+"Možno sa chystáte vykonaÅ¥ nieÄo Å¡kodlivé.\n"
"Pre pokraÄovanie opíšte frázu '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Prerušené."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokraÄovaÅ¥ [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "SÅ¥ahovanie ukonÄené v režime \"iba stiahnuÅ¥\""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -872,47 +895,47 @@ msgstr ""
"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
"fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výmena média nie sú momentálne podporované"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Inštalácia sa prerušuje."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Poznámka: %s sa vyberá namiesto %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuálny balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "[Inštalovaný]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -922,49 +945,49 @@ msgstr ""
"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
"že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Avšak nahrádzajú ho nasledovné balíky:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta na inštaláciu"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je už najnovšej verzie.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie '%s' pre '%s'"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia '%s' pre '%s'"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -972,25 +995,44 @@ msgstr ""
"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
"použili staršie verzie."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnútorná chyba, problem resolver pokazil veci"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -998,7 +1040,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1010,7 +1052,7 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1020,124 +1062,124 @@ msgstr ""
"balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n"
"(bug report) pre daný balík."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "OdporúÄané balíky:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "PrepoÄítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
+msgstr "Vnútorná chyba, problem resolver pokazil veci"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, 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:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Skontrolujte, Äi je nainÅ¡talovaný balík 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti pre zostavenie %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1146,31 +1188,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1350,19 +1392,19 @@ msgstr "ZluÄujú sa dostupné informácie"
msgid "Failed to create pipes"
msgstr "Vytvorenie rúry zlyhalo"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Spustenie gzip zlyhalo "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Porušený archív"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Kontrolný súÄet pre tar zlyhal, archív je poÅ¡kodený"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznáma hlaviÄka TARu typ %u, Älen %s"
@@ -1419,11 +1461,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "Duplicitný konfiguraÄný súbor %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Zápis do súboru %s zlyhal"
+msgstr "Zápis súboru %s zlyhal"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Zatvorenie súboru %s zlyhalo"
@@ -1476,7 +1518,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Súbor %s/%s prepisuje ten z balíka %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "%s sa nedá ÄítaÅ¥"
@@ -1506,9 +1549,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "NaÄítavajú sa zoznamy balíkov"
@@ -1522,7 +1565,7 @@ msgstr "Nedá sa zmeniť na admin adresár %sinfo"
msgid "Internal error getting a package name"
msgstr "Vnútorná chyba pri získavaní názvu balíka"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "NaÄítavam výpis súborov"
@@ -1566,14 +1609,9 @@ msgid "Internal error adding a diversion"
msgstr "Vnútorná chyba pri pridávaní diverzie"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "NaÄítavam zoznam súborov"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1639,20 +1677,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Súbor nebol nájdený"
+msgstr "Disk sa nenašiel."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "Súbor nebol nájdený"
+msgstr "Súbor sa nenašiel"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie Äasu zmeny"
@@ -1780,7 +1817,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1803,7 +1840,7 @@ msgstr "Prenos dát zlyhal, server odpovedal '%s'"
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
@@ -1832,75 +1869,78 @@ msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nedá sa pripojiÅ¥ k %s:%s (%s), uplynul Äas spojenia"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nedá sa pripojiť k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Pripája sa k %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nedá sa zistiť '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "DoÄasné zlyhanie pri zisÅ¥ovaní '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "NieÄo veľmi zlé sa prihodilo pri zisÅ¥ovaní '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Nedá sa pripojiť k %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Zväzok kľúÄov '%s' je nedostupný."
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliÅ¡ dlhý. UkonÄuje "
+"sa."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiÅ¥ odtlaÄok kľúÄa?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Zámok %s sa nedá získať"
+msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Nedá sa spustiť '%s' na kontrolu signatúry (je nainštalované gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Nainštalujú sa nasledovné extra balíky:"
+msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
+"kľúÄ:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1912,76 +1952,76 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri Äítaní z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "ÄŒaká sa na hlaviÄky"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlaviÄky cez %u znakov"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlaviÄka"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr "Http server poslal neplatnú hlaviÄku odpovede"
+msgstr "HTTP server poslal neplatnú hlaviÄku odpovede"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Http server poslal neplatnú hlaviÄku Content-Length"
+msgstr "HTTP server poslal neplatnú hlaviÄku Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Http server poslal neplatnú hlaviÄku Content-Range"
+msgstr "HTTP server poslal neplatnú hlaviÄku Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Uplynul Äas spojenia"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri Äítaní zo servera. Druhá strana ukonÄila spojenie"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba pri Äítaní zo servera"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -1994,7 +2034,7 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nedá sa urobiť mmap %lu bajtov"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2116,7 +2156,7 @@ msgstr "Neplatná operácia %s"
msgid "Unable to stat the mount point %s"
msgstr "Prípojný bod %s sa nedá vyhodnotiť"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nedá sa prejsť do %s"
@@ -2261,74 +2301,89 @@ msgstr "voliteľný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Vytvára sa strom závislostí"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandidátske verzie"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Generovanie závislostí"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "ZluÄujú sa dostupné informácie"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s sa nedá otvoriť"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Zápis súboru %s zlyhal"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Súbor %s sa nedá spracovať (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
@@ -2349,13 +2404,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ súboru '%s' nie je podporovaný"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2363,9 +2418,9 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, Äo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v narušenom stave."
+msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
#: apt-pkg/acquire.cc:62
#, c-format
@@ -2377,10 +2432,17 @@ msgstr "Adresár zoznamov %spartial chýba."
msgid "Archive directory %spartial is missing."
msgstr "Archívny adresár %spartial chýba."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Sťahuje sa %li. súbor z %li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2392,20 +2454,17 @@ msgstr "Nedá sa nájsÅ¥ ovládaÄ spôsobu %s."
msgid "Method %s did not start correctly"
msgstr "Spôsob %s nebol správne spustený"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Výmena média: Vložte disk nazvaný\n"
-" '%s'\n"
-"do mechaniky '%s' a stlaÄte Enter\n"
+msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlaÄte Enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "BalíÄkovací systém '%s' nie je podporovaný"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa urÄiÅ¥ vhodný typ balíÄkovacieho systému"
@@ -2439,84 +2498,84 @@ msgstr "Nezrozumiteľné pripevnenie typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Vyrovnávacia pamäť má nezluÄiteľný systém na správu verzií"
-#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Chyba pri spracovaní %s (NewPackage)"
+msgstr "Chyba pri spracovávaní %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Chyba pri spracovaní %s (UsePackage1)"
+msgstr "Chyba pri spracovávaní %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Chyba pri spracovaní %s (UsePackage2)"
+msgstr "Chyba pri spracovávaní %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Chyba pri spracovaní %s (NewFileVer1)"
+msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Chyba pri spracovaní %s (NewVersion1)"
+msgstr "Chyba pri spracovávaní %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Chyba pri spracovaní %s (UsePackage3)"
+msgstr "Chyba pri spracovávaní %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Chyba pri spracovaní %s (NewVersion2)"
+msgstr "Chyba pri spracovávaní %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Fíha, prekroÄili ste poÄet názvov balíkov, ktoré toto APT zvládne spracovaÅ¥."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Fíha, prekroÄili ste poÄet verzií, ktoré toto APT zvládne spracovaÅ¥."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Fíha, prekroÄili ste poÄet závislostí, ktoré toto APT zvládne spracovaÅ¥."
-#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Chyba pri spracovaní %s (FindPkg)"
+msgstr "Chyba pri spracovávaní %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Chyba pri spracovaní %s (CollectFileProvides)"
+msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
@@ -2525,11 +2584,15 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súÄtov"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Nie sú dostupné žiadne verejné kľúÄe ku kľúÄom s nasledovnými ID:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2538,7 +2601,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2547,13 +2610,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
@@ -2658,58 +2721,58 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Otvára sa %s"
+msgstr "Pripravuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Otvára sa %s"
+msgstr "Rozbaľuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Otvára sa konfiguraÄný súbor %s"
+msgstr "Pripravuje sa nastavenie %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Pripája sa k %s"
+msgstr "Nastavuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Nainštalovaná verzia: "
+msgstr "Nainštalovaný balík %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Pripravuje sa odstránenie %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Otvára sa %s"
+msgstr "Odstraňuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "OdporúÄa"
+msgstr "Odstránený balík %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Pripravuje sa úplné odstránenie %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Balík '%s' je úplne odstránený"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojenie bolo predÄasne ukonÄené"
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s"
+#~ msgid "File date has changed %s"
+#~ msgstr "Dátum súboru sa zmenil %s"
diff --git a/po/sl.po b/po/sl.po
index 91fd99505..0dc882690 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: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Èuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -143,14 +143,14 @@ msgstr " Tabela razlièic:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -224,6 +224,22 @@ msgstr ""
" -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n"
"Za veè informacij si oglejte strani man apt-cache(8) in apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Sprememba medija: vstavite disk z oznako\n"
+" '%s'\n"
+"v enoto '%s' in pritisnite enter\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenti niso v parih"
@@ -285,7 +301,7 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoèe pisati na %s"
@@ -408,115 +424,126 @@ msgstr "Nobena izbira se ne ujema"
msgid "Some files are missing in the package file group `%s'"
msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "ZP je stara, posku¹am nadgraditi %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni mogoèe odprti datoteke ZP %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Datum datoteke se je spremenil %s"
+msgid "Failed to stat %s"
+msgstr "Napaka pri postavitvi %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arhiv nima nadzornega zapisa"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Ni mogoèe najti kazalca"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "O: ni mogoèe brati imenika %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "O: Ni mogoèe nastaviti %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "O: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "N: Napake se sklicujejo na datoteko"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Ni mogoèe razre¹iti %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Hoja drevesa ni uspela"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Ni mogoèe odprti %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " RazVe¾i %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Napaka pri branju povezave %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Napaka pri odvezovanju %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Napaka pri povezovanju %s z %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Dose¾ena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Napaka pri postavitvi %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prekrivnega vnosa\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdr¾evalec %s je %s in ne %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nima prekrivnega vnosa\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s nima prekrivnega vnosa\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -612,79 +639,79 @@ msgstr "Napaka pri odvezovanju %s"
msgid "Failed to rename %s to %s"
msgstr "Ni mogoèe preimenovati %s v %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nere¹ene odvisnosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s name¹èen"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s name¹èen"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "vendar ni name¹èen"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "vendar ne bo name¹èen"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " ali"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo name¹èeni:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadr¾ani:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -693,144 +720,144 @@ msgstr ""
"OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n"
"To NI priporoèljivo, razen èe natanèno veste, kaj poènete."
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo name¹èenih, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Popravljanje odvisnosti ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " spodletelo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Ni mogoèe popraviti odvisnosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Opravljeno"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Namestim te pakete brez prevejanje [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Nisem uspel avtenticirati nekaterih paketkov"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
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"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Ni mogoèe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoèe brati."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potrebno je dobiti %sB arhivov.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s je premalo prostora."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Da, naredi tako kot pravim!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -841,28 +868,28 @@ msgstr ""
"Za nadaljevanje vnesite frazo '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Prekini."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Ali ¾elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoèe dobiti %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -870,47 +897,47 @@ msgstr ""
"Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --"
"fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Ni mogoèe popraviti manjkajoèih paketov."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Prekinjanje namestitve."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Opomba: izbran %s namesto %s \n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ni name¹èen, zato ni odstranjen\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paket %s je navidezen in ga je priskrbel:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Name¹èeno]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Sami izberite paket, ki ga ¾elite namestiti."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -921,49 +948,49 @@ msgstr ""
"To ponavadi pomeni, da paket manjka, je zastaran ali\n"
"pa je na voljo samo iz drugega vira.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s nima kandidata za namestitev"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Izdaje '%s' za '%s' ni mogoèe najti"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Razlièice '%s' za '%s' ni mogoèe najti"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razlièica %s (%s) za %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoèe zakleniti"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -971,25 +998,44 @@ msgstr ""
"Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so "
"uporabljena starej¹a."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Notranja napaka zaradi AllUpgrade."
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoèe najti paketa %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -997,7 +1043,7 @@ msgstr ""
"Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte re¹itev)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1008,7 +1054,7 @@ msgstr ""
"nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1018,125 +1064,126 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo name¹èeni:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Priporoèeni paketi:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Preraèunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoèe najti"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoèe dobiti."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Otro¹ki proces ni uspel"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1145,31 +1192,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
"more zadostiti zahtevi po razlièici"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, 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:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1351,19 +1398,19 @@ msgstr "Spajanje informacij na voljo"
msgid "Failed to create pipes"
msgstr "Ni mogoèe ustvariti pip"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Ni mogoèe izvesti gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Pokvarjen arhiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznan tip glave TAR %u, èlan %s"
@@ -1424,7 +1471,7 @@ msgstr "Dvojnik datoteke z nastavitvami %s/%s"
msgid "Failed to write file %s"
msgstr "Napaka pri pisanju datoteke %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Napaka pri zapiranju datoteke %s"
@@ -1477,7 +1524,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoèe brati %s"
@@ -1507,9 +1555,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Branje seznama paketov"
@@ -1523,7 +1571,7 @@ msgstr "Premik v skrbnikov imenik %sinfo ni uspel"
msgid "Internal error getting a package name"
msgstr "Notranja napaka pri sprejemanju imena paketa"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Branje seznama datotek"
@@ -1569,10 +1617,6 @@ msgstr "Notranja napaka pri dodajanju odklona"
msgid "The pkg cache must be initialized first"
msgstr "Najprej se mora izvesti predpomnilnik paketov"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Branje seznama datotek"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1646,12 +1690,12 @@ msgstr "Datoteke ni mogoèe najti"
msgid "File not found"
msgstr "Datoteke ni mogoèe najti"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Doloèitev ni uspela"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nastavitev èasa spremembe ni uspela"
@@ -1779,7 +1823,7 @@ msgstr "Povezava podatkovne vtiènice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoèe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Te¾ava pri razpr¹evanju datoteke"
@@ -1802,7 +1846,7 @@ msgstr "Prenos podatkov ni uspel, stre¾nik je odgovoril '%s'"
msgid "Query"
msgstr "Poizvedba"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Ni mogoèe zagnati "
@@ -1831,71 +1875,71 @@ msgstr "Ni mogoèe zaèeti povezave z %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Ni se mogoèe povezati z %s:%s (%s). Povezava potekla."
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ni se mogoèe povezati z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se z %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ni mogoèe razre¹iti '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Zaèasna napaka pri razre¹evanju '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Pri¹lo je do napake pri razre¹evanju '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Ni se mogoèe povezati z %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Ni mogoèe razre¹iti '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Ni mogoèe dobiti zaklenjene datoteke %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Naslednji dodatni paketi bodo name¹èeni:"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1911,76 +1955,76 @@ msgstr "Ni mogoèe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Èakanje na glave"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Napaèna vrstica glave"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Èas za povezavo se je iztekel"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Napaka pri branju s stre¾nika"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Napaèni podatki glave"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Notranja napaka"
@@ -1993,7 +2037,7 @@ msgstr "mmap prazne datoteke ni mogoè"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoèe narediti mmap %lu bajtov"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Izbira %s ni mogoèe najti"
@@ -2115,7 +2159,7 @@ msgstr "Napaèna operacija %s"
msgid "Unable to stat the mount point %s"
msgstr "Ni mogoèe doloèiti priklopne toèke %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni mogoèe spremeniti v %s"
@@ -2260,74 +2304,89 @@ msgstr "izbirno"
msgid "extra"
msgstr "dodatno"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Gradnja drevesa odvisnosti"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Razlièice kandidatov"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Ustvarjanje odvisnosti"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Spajanje informacij na voljo"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ni mogoèe odprti %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Napaka pri pisanju datoteke %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Napaèna vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Napaèna vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Napaèna vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Odpiram %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Napaèna vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)"
@@ -2348,14 +2407,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2363,7 +2422,7 @@ msgstr ""
"Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda "
"povzroèili zadr¾ani paketi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete."
@@ -2377,11 +2436,18 @@ msgstr "Manjka imenik s seznami %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Manjka imenik z arhivi %spartial."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Branje seznama datotek"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2392,7 +2458,7 @@ msgstr "Ni mogoèe najti gonilnika metod %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s se ni zaèela pravilno"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2400,12 +2466,12 @@ msgstr ""
" '%s'\n"
"v enoto '%s' in pritisnite enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema"
@@ -2439,82 +2505,82 @@ msgstr "Ni mogoèe razumeti vrste zaponke %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prioriteta zaponke ni doloèena ali pa je niè."
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Predpomnilnik ima neustrezen sistem razlièic"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Najdi paket)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Zbiranje dobaviteljev datotek"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
@@ -2523,11 +2589,15 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2536,7 +2606,7 @@ msgstr ""
"Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
"popraviti ta paket (zaradi manjkajoèega arhiva)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2545,7 +2615,7 @@ msgstr ""
"Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2553,7 +2623,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2699,18 +2769,28 @@ msgid "Removed %s"
msgstr "Priporoèa"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Odpiranje nastavitvene datoteke %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Odstranitev %s ni uspela"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Povezava se je prezgodaj zaprla"
+#~ msgid "File date has changed %s"
+#~ msgstr "Datum datoteke se je spremenil %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Branje seznama datotek"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Ni mogoèe dobiti zaklenjene datoteke %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s"
diff --git a/po/sv.po b/po/sv.po
index 172761955..d31252566 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,19 @@
# Advanced Package Tool - APT message translation catalog
# Swedish messages
# Peter Karlsson <peterk@debian.org>, 2002-2005.
-# Based on Danish messages
-# Claus Hindsgaul <claus_h@image.dk>, 2002.
-#
+# Daniel Nylander <po@danielnylander.se>, 2005.
+#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.6\n"
+"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-10-09 09:41+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-18 08:35+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#: cmdline/apt-cache.cc:135
#, c-format
@@ -148,14 +147,14 @@ msgstr " Versionstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s för %s %s kompilerad den %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -229,6 +228,18 @@ msgstr ""
" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n"
"Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Ange ett namn för denna skiva, såsom \"Debian 2.1r1 Disk 1\""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Mata in skivan i enheten och tryck Enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repetera denna process för resten av CD-skivorna i din uppsättning."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Flaggorna gavs inte parvis"
@@ -290,7 +301,7 @@ msgstr ""
" -c=? Läs denna inställningsfil.\n"
" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -413,119 +424,129 @@ msgstr "Inga val träffades"
msgid "Some files are missing in the package file group `%s'"
msgstr "Några filer saknas i paketfilsgruppen \"%s\""
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB var trasig, filen omdöpt till %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB är för gammal, försöker uppgradera %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Kunde inte öppna DB-filen %s: %s"
-# Felmeddelande för misslyckad chdir
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Fildatumet har ändrats %s"
+msgid "Failed to stat %s"
+msgstr "Misslyckades att ta status på %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkivet har ingen styrpost"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "V: Kunde inte läsa katalogen %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "V: Kunde inte ta status på %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "V: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "F: Felen gäller filen "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades att slå upp %s"
# ???
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Trävandring misslyckades"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Misslyckades att öppna %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Avlänka %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Misslyckades att läsa länk %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Misslyckades att länka ut %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Misslyckades att länka %s till %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgräns på %sB nådd.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Misslyckades att ta status på %s"
-
# Fält vid namn "Package"
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, 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:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för %s är %s ej %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s har ingen post i override-filen\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s har ingen post i override-filen\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -623,79 +644,79 @@ msgstr "Problem med att länka ut %s"
msgid "Failed to rename %s to %s"
msgstr "Misslyckades att byta namn på %s till %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljärt uttryck - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "men %s är installerat"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skall installeras"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "men det är ett virtuellt paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "men det är inte installerat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "Följande NYA paket kommer att installeras:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "Följande paket kommer att TAS BORT:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "Följande paket har hållits tillbaka:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "Följande paket kommer att uppgraderas:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Följande paket kommer att NEDGRADERAS:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Följande hållna paket kommer att ändras:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (på grund av %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -703,143 +724,145 @@ msgstr ""
"VARNING: Följande systemkritiska paket kommer att tas bort\n"
"Detta bör INTE göras såvida du inte vet exakt vad du gör!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu uppgraderade, %lu nyinstallerade, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ominstallerade, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu ej uppgraderade.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ej helt installerade eller borttagna.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Rättar beroenden...."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " misslyckades."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Kunde inte rätta beroenden"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Färdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan möjligen rätta dessa genom att köra \"apt-get -f install\"."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "Otillfredsställda beroenden. Försök med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VARNING: Följande paket kunde inte autentiseras!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr "Authentiseringsvarning överkörd.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "Installera dessa paket utan verifiering [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "Några av paketen kunde inte autentiseras"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "Problem har uppstått och -y användes utan --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internt fel. InstallPackages kallades upp med brutna paket!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "Paket måste tas bort men \"Remove\" är inaktiverat."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen färdigställdes inte"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian.org"
+msgstr ""
+"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian."
+"org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Behöver hämta %sB/%sB arkiv.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Behöver hämta %sB arkiv.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter uppackning kommer %sB ytterligare diskutrymme användas.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigöras på disken.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte läsa av ledigt utrymme i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillräckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Ja, gör som jag säger!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -847,32 +870,32 @@ msgid ""
" ?] "
msgstr ""
"Du är på väg att göra något som kan vara skadligt\n"
-"Skriv frasen '%s' för att fortsätta\n"
+"Skriv frasen \"%s\" för att fortsätta\n"
" ?] "
# Visas då man svarar nej
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hämta %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "Misslyckades att hämta vissa filer"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -880,48 +903,48 @@ msgstr ""
"Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med "
"--fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing och mediabyte stöds inte ännu"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Kunde inte rätta saknade paket."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Avbryter installationen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Observera, väljer %s istället för %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paketet %s är inte installerat, så tas inte bort\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [Installerat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "Du bör explicit ange ett att installera."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -932,49 +955,49 @@ msgstr ""
"Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n"
"bara är tillgängligt från andra källor\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Dock kan följande paket ersätta det:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketet %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s är redan den senaste versionen.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" för \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) för %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Kunde inte låsa listkatalogen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -982,25 +1005,44 @@ msgstr ""
"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
"använts istället."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Följande information kan vara till hjälp för att lösa situationen:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Internt fel, problemlösaren bröt sönder saker"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, väljer %s för regex \"%s\"\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1008,7 +1050,7 @@ msgstr ""
"Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket "
"(eller ange en lösning)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1020,7 +1062,7 @@ msgstr ""
"distributionen, att några krävda paket ännu inte har skapats eller\n"
"lagts in från \"Incoming\"."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1030,114 +1072,115 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta bör\n"
"skrivas."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "Följande information kan vara till hjälp för att lösa situationen:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Föreslagna paket:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Färdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren bröt sönder saker"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange åtminstone ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, 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:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar över redan hämtad fil \"%s\"\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillräckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkod %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hämta vissa arkiv."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Kontrollera om paketet 'dpkg-dev' är installerat.\n"
+msgstr "Kontrollera att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta byggberoendeinformation för %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1145,7 +1188,7 @@ msgid ""
msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1154,32 +1197,32 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s "
"är för nytt"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1365,19 +1408,19 @@ msgstr "Lägger in tillgänglighetsinformation"
msgid "Failed to create pipes"
msgstr "Misslyckades att skapa rör"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Misslyckades att köra gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Fördärvat arkiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Okänd TAR-huvudtyp %u, del %s"
@@ -1439,7 +1482,7 @@ msgstr "Duplicerad konfigurationsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Misslyckades att skriva filen %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Misslyckades att stänga filen %s"
@@ -1493,7 +1536,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Filen %s/%s skriver över den i paketet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
@@ -1523,9 +1567,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Katalogerna info och temp måste ligga på samma filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Läser paketlistor"
@@ -1540,7 +1584,7 @@ msgstr "Kunde inte gå till adminkatalogen %sinfo"
msgid "Internal error getting a package name"
msgstr "Internt fel när namn på Package-fil skulle hämtas"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Läser fillista"
@@ -1586,10 +1630,6 @@ msgstr "Internt fel när en omdirigering skulle läggas till"
msgid "The pkg cache must be initialized first"
msgstr "Paketcachen måste ha initierats först"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Läser fillista"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1663,12 +1703,12 @@ msgstr "Disk ej funnen."
msgid "File not found"
msgstr "Filen ej funnen"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Misslyckades sätta modifieringstid"
@@ -1796,7 +1836,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgräns"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutning"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
@@ -1820,7 +1860,7 @@ msgstr "Dataöverföring misslyckades, servern sade \"%s\""
msgid "Query"
msgstr "Frågar"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Kunde inte starta "
@@ -1851,76 +1891,79 @@ msgstr "Kunde inte påbörja anslutning till %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunde inte ansluta till %s:%s (%s), tog för lång tid"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunde inte ansluta till %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Ansluter till %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunde inte slå upp \"%s\""
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärt fel vid uppslagning av \"%s\""
# Okänd felkod; %i = koden
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Något otäckt hände när \"%s:%s\" slogs upp (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Kunde inte ansluta till %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kunde inte komma åt nyckelring: \"%s\""
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "Åtminstone en giltig signatur träffades på."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Kunde inte exekvera "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " för att verifiera signature (är gnupg installerad?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid exekvering av gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Följande signaturer kunde inte verifieras för att den publika nyckeln inte är tillgänglig:\n"
+"Följande signaturer kunde inte verifieras för att den publika nyckeln inte "
+"är tillgänglig:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1933,76 +1976,76 @@ msgstr "Kunde inte öppna rör för %s"
msgid "Read error from %s process"
msgstr "Läsfel på %s-processen"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Väntar på huvuden"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad på %u tecken"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern sände ett ogiltigt svarshuvud"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern sände ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern sände ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers stöd för delvis hämtning fungerar inte"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsgränsen för anslutningen nåddes"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internt fel"
@@ -2015,7 +2058,7 @@ msgstr "Kan inte utföra mmap på en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utföra mmap på %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s ej funnet"
@@ -2137,7 +2180,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kunde inte ta status på monteringspunkt %s."
# Felmeddelande för misslyckad chdir
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunde inte gå till %s"
@@ -2279,80 +2322,95 @@ msgstr "normalt"
#: apt-pkg/pkgcache.cc:232
msgid "optional"
-msgstr "valbart"
+msgstr "valfri"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Bygger beroendeträd"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Kandiderande versioner"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Beroendegenerering"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Lägger in tillgänglighetsinformation"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades att öppna %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades att skriva filen %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kunde inte tolka paketfilen %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i källistan %s har fel format (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i källistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Öppnar %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen \"%s\" är okänd på rad %u i källistan %s"
+msgstr "Typ \"%s\" är okänd på rad %u i listan över källor %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
@@ -2374,14 +2432,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexfiler av typ \"%s\" stöds inte"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2389,7 +2447,7 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
"hållna paket."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket."
@@ -2403,10 +2461,17 @@ msgstr "Listkatalogen %spartial saknas."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "Laddar ner fil %li av %li (%s återstår)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Hämtar fil %li av %li (%s återstår)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Hämtar fil %li av %li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2418,18 +2483,18 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startade inte korrekt"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter."
+msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stöds inte"
-#
-#: apt-pkg/init.cc:135
+#
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte avgöra en lämpligt paketsystemstyp"
@@ -2464,84 +2529,84 @@ msgstr "Förstod inte nåltypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Cachen har ett inkompatibelt versionssystem"
# NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Fel uppstod vid hantering av %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Fel uppstod vid hantering av %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Grattis, du överskred antalet paketnamn denna APT kan hantera."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Grattis, du överskred antalet versioner denna APT kan hantera."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera."
# NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "Samlar filberoenden"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av källcache"
@@ -2550,11 +2615,15 @@ msgstr "In-/utfel vid lagring av källcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stämmer inte"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2563,7 +2632,7 @@ msgstr ""
"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2572,13 +2641,13 @@ msgstr ""
"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
@@ -2723,18 +2792,34 @@ msgstr "Tog bort %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Förbereder för borttagning med konfiguration %s"
+msgid "Preparing to completely remove %s"
+msgstr "Förbereder att ta bort hela %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr "Borttagen med konfiguration %s"
+msgid "Completely removed %s"
+msgstr "Tog bort hela %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Förbindelsen stängdes i förtid"
+# Felmeddelande för misslyckad chdir
+#~ msgid "File date has changed %s"
+#~ msgstr "Fildatumet har ändrats %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Läser fillista"
+
+#~ msgid "Could not execute "
+#~ msgstr "Kunde inte exekvera "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Förbereder för borttagning med konfiguration %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Borttagen med konfiguration %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s"
@@ -2743,7 +2828,8 @@ msgstr "Förbindelsen stängdes i förtid"
#~ "dependencies.\n"
#~ "You might want to run `apt-get -f install' to correct these."
#~ msgstr ""
-#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan möjligen\n"
+#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan "
+#~ "möjligen\n"
#~ "rätta detta genom att köra \"apt-get -f install\"."
#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
diff --git a/po/tl.po b/po/tl.po
index b235b5ac1..b065b128c 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -1,17 +1,17 @@
# Tagalog messages for apt debconf.
# Copyright (C) 2005 Software in the Public Interest, Inc.
# This file is distributed under the same license as apt.
-# Itong tipunan ay ipinamamahagi sa parehong lisensya ng apt.
+# Itong talaksan ay ipinapamahagi sa parehong lisensya ng apt.
# Eric Pareja <xenos@upm.edu.ph>, 2005
# This file is maintained by Eric Pareja <xenos@upm.edu.ph>
-# Itong tipunan ay inaalagaan ni Eric Pareja <xenos@upm.edu.ph>
+# Itong talaksan ay inaalagaan ni Eric Pareja <xenos@upm.edu.ph>
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-09 16:36+0800\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-03-16 15:53+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
"MIME-Version: 1.0\n"
@@ -22,18 +22,18 @@ msgstr ""
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Paketeng %s bersyon %s ay may di ayos na dep:\n"
+msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "Di mahanap ang paketeng %s"
+msgstr "Hindi mahanap ang paketeng %s"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr "Kabuuang mga Pakete : "
+msgstr "Kabuuan ng mga Pakete : "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
@@ -45,7 +45,7 @@ msgstr " Purong Birtwual na Pakete: "
#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
-msgstr " Mag-isang Birtwal na Pakete: "
+msgstr " Nag-iisang Birtwal na Pakete: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
@@ -57,40 +57,40 @@ msgstr " Kulang/Nawawala: "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr "Kabuuang Kakaibang Bersyon: "
+msgstr "Kabuuan ng Natatanging mga Bersyon: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr "Kabuuang Dependensiya: "
+msgstr "Kabuuan ng mga Dependensiya: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr "Kabuuang Ber/Tipunan relasyon: "
+msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr "Kabuuang Mapping ng Provides: "
+msgstr "Kabuuan ng Mapping ng Provides: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr "Kabuuang Globbed String: "
+msgstr "Kabuuan ng Globbed String: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr "Kabuuang lugar ng Dependensiya Bersyon: "
+msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr "Kabuuang Maluwag na lugar: "
+msgstr "Kabuuan ng Hindi Nagamit na puwang: "
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr "Kabuuang lugar na napag-tuosan: "
+msgstr "Kabuuan ng puwang na napag-tuosan: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Wala sa sync ang tipunang pakete %s."
+msgstr "Wala sa sync ang talaksan ng paketeng %s."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
@@ -102,11 +102,11 @@ msgstr "Walang nahanap na mga pakete"
#: cmdline/apt-cache.cc:1462
msgid "Package files:"
-msgstr "Tipunang Pakete:"
+msgstr "Talaksang Pakete:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Wala sa sync ang cache, hindi ma-x-ref ang tipunang pakete"
+msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -120,12 +120,12 @@ msgstr "Mga naka-Pin na Pakete:"
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
-msgstr "(di nahanap)"
+msgstr "(hindi nahanap)"
#. Installed version
#: cmdline/apt-cache.cc:1515
msgid " Installed: "
-msgstr " Naka-instol: "
+msgstr " Nakaluklok: "
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
@@ -150,14 +150,14 @@ msgstr " Talaang Bersyon:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -196,22 +196,22 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"Pag-gamit: apt-cache [mga option] utos\n"
-" apt-cache [mga option] add tipunan1 [tipunan2 ...]\n"
+" apt-cache [mga option] add talaksan1 [talaksan2 ...]\n"
" apt-cache [mga option] showpkg pkt1 [pkt2 ...]\n"
" apt-cache [mga option] showsrc pkt1 [pkt2 ...]\n"
"\n"
"apt-cache ay isang kagamitang low-level para sa pag-manipula\n"
-"ng mga tipunan sa binary cache ng APT, at upang makakuha ng\n"
+"ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n"
"impormasyon mula sa kanila\n"
"\n"
"Mga utos:\n"
-" add - Magdagdag ng tipunang pakete sa source cache\n"
+" add - Magdagdag ng talaksang pakete sa source cache\n"
" gencaches - Buuin pareho ang cache ng pakete at source\n"
" showpkg - Ipakita ang impormasyon tungkol sa isang pakete\n"
" showsrc - Ipakita ang mga record ng source\n"
" stats - Ipakita ang ilang mga estadistika\n"
-" dump - Ipakita ang buong tipunan sa anyong maikli\n"
-" dumpavail - Ipakita ang tipunang available sa stdout\n"
+" dump - Ipakita ang buong talaksan sa anyong maikli\n"
+" dumpavail - Ipakita ang talaksang available sa stdout\n"
" unmet - Ipakita ang mga kulang na mga dependensiya\n"
" search - Maghanap sa listahan ng mga pakete ng regex pattern\n"
" show - Ipakita ang nababasang record ng pakete\n"
@@ -227,16 +227,28 @@ msgstr ""
" -h Itong tulong na ito.\n"
" -p=? Ang cache ng mga pakete.\n"
" -s=? Ang cache ng mga source.\n"
-" -q Huwag ipakita ang indikator ng progreso.\n"
+" -q Huwag ipakita ang hudyat ng progreso.\n"
" -i Ipakita lamang ang importanteng mga dep para sa utos na unmet\n"
-" -c=? Basahin ang tipunang pagkaayos na ito\n"
+" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
"Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
"karagdagang impormasyon\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "Mga argumento ay hindi nakapares"
+msgstr "Mga argumento ay hindi naka-pares"
#: cmdline/apt-config.cc:76
msgid ""
@@ -255,7 +267,7 @@ msgid ""
msgstr ""
"Pag-gamit: apt-config [mga option] utos\n"
"\n"
-"Ang apt-config ay simpleng kagamitan sa pagbasa ng tipunang pagkaayos\n"
+"Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos\n"
"ng APT\n"
"\n"
"Mga utos:\n"
@@ -263,13 +275,13 @@ msgstr ""
" dump - ipakita ang pagkaayos\n"
"Mga option:\n"
" -h Itong tulong na ito.\n"
-" -c=? Basahin itong tipunang pagkaayos\n"
+" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr "%s ay di tanggap na paketeng DEB."
+msgstr "%s ay hindi balido na paketeng DEB."
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -284,29 +296,29 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Pag-gamit: apt-extracttemplates tipunan1 [tipunan2 ...]\n"
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
"\n"
"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
"sa pagkaayos at template mula sa mga paketeng debian\n"
"\n"
-"Mga option:\n"
+"Mga opsyon:\n"
" -h Itong tulong na ito\n"
" -t Itakda ang dir na pansamantala\n"
-" -c=? Basahin ang tipunang pagkaayos na ito\n"
+" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
-msgstr "Hindi makasulat sa %s"
+msgstr "Hindi makapagsulat sa %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Hindi makuha ang bersyon ng debconf. Naka-instol ba ang debconf?"
+msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
-msgstr "Mahaba masyado ang talaang extensyon ng mga pakete"
+msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
@@ -317,11 +329,11 @@ msgstr "Error sa pagproseso ng directory %s"
#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
-msgstr "Mahaba masyado ang talaang extensyon ng pagkukunan (source)"
+msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Error sa pagsulat ng header sa tipunang nilalaman (contents)"
+msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
@@ -329,7 +341,6 @@ msgid "Error processing contents %s"
msgstr "Error sa pagproseso ng Contents %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -378,24 +389,27 @@ msgstr ""
" generate config [mga grupo]\n"
" clean config\n"
"\n"
-"Ang apt-ftparchive ay gumagawa ng tipunang index para sa arkibong Debian.\n"
+"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n"
"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n"
"at kapalit ng dpkg-scanpackages at dpkg-scansources\n"
"\n"
-"Bumubuo ang apt-ftparchive ng mga tipunang Package mula sa puno ng mga\n"
-".deb. Ang tipunang Package ay naglalaman ng laman ng lahat ng control field\n"
-"mula sa bawat pakete pati na rin ang MD5 hash at laki ng tipunan. Suportado\n"
-"ang pag-gamit ng tipunang override upang pilitin ang halaga ng Priority at "
+"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n"
+".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control "
+"field\n"
+"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. "
+"Suportado\n"
+"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at "
"Section.\n"
"\n"
-"Bumubuo din ang apt-ftparchive ng tipunang Sources mula sa puno ng mga\n"
+"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n"
".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n"
-"ang tipunang override ng src\n"
+"ang talaksang override ng src\n"
"\n"
"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n"
"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n"
-"at ang tipunang override ay dapat naglalaman ng mga flag na override. Ang\n"
-"pathprefix ay dinudugtong sa harap ng mga pangalan ng tipunan kung mayroon.\n"
+"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n"
+"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung "
+"mayroon.\n"
"Halimbawa ng pag-gamit mula sa arkibong Debian:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
@@ -403,131 +417,142 @@ msgstr ""
"Mga option:\n"
" -h Itong tulong na ito\n"
" --md5 Pagbuo ng MD5\n"
-" -s=? Tipunang override ng source\n"
+" -s=? Talaksang override ng source\n"
" -q Tahimik\n"
" -d=? Piliin ang optional caching database\n"
" --no-delink Enable delinking debug mode\n"
-" --contents Pagbuo ng tipunang contents\n"
-" -c=? Basahin itong tipunang pagkaayos\n"
+" --contents Pagbuo ng talaksang contents\n"
+" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option na pagkaayos"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr "Walang mga piniling nag-match"
+msgstr "Walang mga pinili na tugma"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "May mga tipunang kulang sa grupong tipunang pakete `%s'"
+msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Nasira ang DB, pinalitan ng pangalan ang tipunan sa %s.old"
+msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang i-apgreyd %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Hindi mabuksan ang tipunang DB %s: %s"
+msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Nagbago ang petsa ng tipunan %s"
+msgid "Failed to stat %s"
+msgstr "Bigo ang pag-stat ng %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
-msgstr "Walang control record ang arkibo"
+msgstr "Walang kontrol rekord ang arkibo"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Hindi mabasa ang directory %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Hindi ma-stat %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
-msgstr "E: Mga error ay tumutukoy sa tipunang "
+msgstr "E: Mga error ay tumutukoy sa talaksang "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
-msgstr "Sawi sa pag-resolba %s"
+msgstr "Bigo sa pag-resolba ng %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
-msgstr "Sawi ang paglakad sa puno"
+msgstr "Bigo ang paglakad sa puno"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
-msgstr "Sawi ang pagbukas ng %s"
+msgstr "Bigo ang pagbukas ng %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
-msgstr "Sawi ang pagbasa ng link %s"
+msgstr "Bigo ang pagbasa ng link %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
-msgstr "Sawi ang pag-unlink ng %s"
+msgstr "Bigo ang pag-unlink ng %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Sawi ang pag-link ng %s sa %s"
+msgstr "*** Bigo ang pag-link ng %s sa %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Sawi ang pag-stat ng %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " Maintainer ng %s ay %s hindi %s\n"
+msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s ay walang override entry\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s ay walang override entry\n"
#: ftparchive/contents.cc:317
#, c-format
@@ -536,7 +561,7 @@ msgstr "Internal error, hindi mahanap ang miyembrong %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Sawi ang pagreserba ng memory"
+msgstr "realloc - Bigo ang pagreserba ng memory"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
@@ -561,12 +586,12 @@ msgstr "Maling anyo ng override %s linya %lu #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Sawi ang pagbasa ng tipunang override %s"
+msgstr "Bigo ang pagbasa ng talaksang override %s"
#: ftparchive/multicompress.cc:75
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Di kilalang algorithmong compression '%s'"
+msgstr "Hindi kilalang algorithmong compression '%s'"
#: ftparchive/multicompress.cc:105
#, c-format
@@ -575,15 +600,15 @@ msgstr "Kailangan ng compression set ang compressed output %s"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Sawi sa paglikha ng IPC pipe sa subprocess"
+msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr "Sawi ang paglikha ng FILE*"
+msgstr "Bigo ang paglikha ng FILE*"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr "Sawi ang pag-fork"
+msgstr "Bigo ang pag-fork"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
@@ -592,15 +617,15 @@ msgstr "Anak para sa pag-Compress"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Error na Internal, Sawi ang paglikha ng %s"
+msgstr "Error na internal, bigo ang paglikha ng %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "Sawi ang paglikha ng subprocess IPC"
+msgstr "Bigo ang paglikha ng subprocess IPC"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "Sawi ang pag-exec ng taga-compress"
+msgstr "Bigo ang pag-exec ng taga-compress"
#: ftparchive/multicompress.cc:363
msgid "decompressor"
@@ -608,11 +633,11 @@ msgstr "taga-decompress"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "Sawi ang IO sa subprocess/tipunan"
+msgstr "Bigo ang IO sa subprocess/talaksan"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "Sawi ang pagbasa habang tinutuos ang MD5"
+msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
#: ftparchive/multicompress.cc:475
#, c-format
@@ -622,230 +647,233 @@ msgstr "Problema sa pag-unlink ng %s"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Sawi ang pagpangalan muli ng %s tungong %s"
+msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
-msgstr "ngunit %s ay naka-instol"
+msgstr "ngunit ang %s ay nakaluklok"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
-msgstr "ngunit %s ay iinstolahin"
+msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
-msgstr "ngunit hindi ito maaaring instolahin"
+msgstr "ngunit hindi ito maaaring iluklok"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr "ngunit ito ay hindi naka-instol"
+msgstr "ngunit ito ay hindi nakaluklok"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
-msgstr "ngunit ito ay hindi iinstolahin"
+msgstr "ngunit ito ay hindi iluluklok"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr "Ang sumusunod na BAGONG mga pakete ay iinstolahin:"
+msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr "Ang susunod na mga pakete ay TATANGGALIN:"
+msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr "Ang susunod na mga pakete ay hinayaang maiwanan:"
+msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr "Ang susunod na mga pakete ay ia-apgreyd:"
+msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n"
+"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nai-upgrade, %lu bagong instol, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
-msgstr "%lu ininstol muli, "
+msgstr "%lu iniluklok muli, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na tatanggalin at %lu na di inapgreyd.\n"
+msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu na di lubos na na-instol o tinanggal.\n"
+msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "Inaayos ang mga dependensiya..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
-msgstr " ay sawi."
+msgstr " ay bigo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "Hindi maayos ang mga dependensiya"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "Hindi mai-minimize ang upgrade set"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " Tapos"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
+"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
-msgstr "Instolahin ang mga paketeng ito na walang beripikasyon [o/H]? "
+msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
+"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr ""
"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "Internal error sa pagdagdag ng diversion"
+msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
-msgstr "Di maaldaba ang directory ng download"
+msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
+"org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Matapos magbuklat ay %sB ng karagdagang lugar sa disk ay magagamit.\n"
+msgstr ""
+"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Matapos magbuklat %sB ng lugar sa disk ay mapapalaya.\n"
+msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Kulang kayo ng libreng puwang sa %s"
+msgstr "Hindi matantsa ang libreng puwang sa %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "Kulang kayo ng libreng lugar sa %s."
+msgstr "Kulang kayo ng libreng puwang sa %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
@@ -855,28 +883,28 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Sawi sa pagkuha ng %s %s\n"
+msgstr "Bigo sa pagkuha ng %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
-msgstr "May mga tipunang hindi nakuha"
+msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
-msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang"
+msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -884,48 +912,48 @@ msgstr ""
"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
"subukang may --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "Hindi maayos ang mga kulang na pakete."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "Ina-abort ang pag-instol."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n"
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n"
+msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
-msgstr " [Naka-instol]"
+msgstr " [Nakaluklok]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
-msgstr "Dapat ninyong piliin ang isa na instolahin."
+msgstr "Dapat kayong mamili ng isa na iluluklok."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -933,79 +961,99 @@ msgid ""
"is only available from another source\n"
msgstr ""
"Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
-"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
+"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
"sa ibang pinagmulan.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n"
+msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"May mga tipunang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
+"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
"mga luma na lamang."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error na internal, may nasira ang problem resolver"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1013,7 +1061,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1024,126 +1072,125 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
"Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n"
-"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
+"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
+msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
-msgstr "Kinakalkula ang upgrade... "
+msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr "Sawi"
+msgstr "Bigo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
+msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
-msgstr "Sawi sa pagkuha ng ilang mga arkibo."
+msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, 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:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Sawi ang utos ng pagbuklat '%s'.\n"
+msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Utos na build '%s' ay sawi.\n"
+msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
-msgstr "Sawi ang prosesong anak"
+msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
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:2096
+#: cmdline/apt-get.cc:2233
#, 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:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1199,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1208,32 @@ 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:2255
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
+"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s"
+msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
-msgstr "Sawi sa pagproseso ng build dependencies"
+msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1244,8 +1291,8 @@ msgstr ""
" build-dep - Magsaayos ng build-dependencies para sa mga paketeng source\n"
" dist-upgrade - Mag-upgrade ng pamudmod, basahin ang apt-get(8)\n"
" dselect-upgrade - Sundan ang mga pinili sa dselect\n"
-" clean - Burahin ang mga nakuhang mga tipunang naka-arkibo\n"
-" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga tipunan\n"
+" clean - Burahin ang mga nakuhang mga talaksang naka-arkibo\n"
+" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan\n"
" check - Tiyakin na walang mga sirang dependensiya\n"
"\n"
"Mga option:\n"
@@ -1255,12 +1302,12 @@ msgstr ""
" -d Kunin lamang - HINDI mag-instol o mag-buklat ng mga arkibo\n"
" -s Walang gagawin. Mag-simulate lamang ang pagkasunod-sunod.\n"
" -y Assume Yes to all queries and do not prompt\n"
-" -f Subukang magpatuloy kung sawi ang pagsuri ng integridad\n"
+" -f Subukang magpatuloy kung bigo ang pagsuri ng integridad\n"
" -m Subukang magpatuloy kung hindi mahanap ang mga arkibo\n"
" -u Ipakita rin ang listahan ng mga paketeng i-upgrade\n"
" -b Ibuo ang paketeng source matapos kunin ito\n"
" -V Ipakita ng buo ang bilang ng bersyon\n"
-" -c=? Basahin itong tipunang pagkaayos\n"
+" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
"Basahin ang pahinang manwal ng apt-get(8), sources.list(5) at apt.conf(5)\n"
"para sa karagdagang impormasyon at mga option.\n"
@@ -1290,7 +1337,7 @@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " [May Ginagawa]"
+msgstr " [May ginagawa]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1320,16 +1367,16 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Pag-gamit: apt-sortpkgs [mga option] tipunan1 [tipunan2 ...]\n"
+"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
"\n"
-"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng tipunang "
+"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
"pakete.\n"
-"Ang option -s ay ginagamit upang ipaalam kung anong klaseng tipunan ito.\n"
+"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
"\n"
"Mga option:\n"
" -h Itong tulong na ito\n"
-" -s Gamitin ang pag-sort ng tipunang source\n"
-" -c=? Basahin ang tipunang pagkaayos na ito\n"
+" -s Gamitin ang pag-sort ng talaksang source\n"
+" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
#: dselect/install:32
@@ -1347,7 +1394,7 @@ msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble"
+msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1359,7 +1406,7 @@ msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin "
-"muli ang [I]nstol."
+"muli ang [I]luklok/Instol."
#: dselect/update:30
msgid "Merging available information"
@@ -1367,28 +1414,28 @@ msgstr "Pinagsasama ang magagamit na impormasyon"
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr "Sawi sa paglikha ng mga pipe"
+msgstr "Bigo sa paglikha ng mga pipe"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
-msgstr "Sawi sa pagtakbo ng gzip "
+msgstr "Bigo sa pagtakbo ng gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Sirang arkibo"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
-msgstr "Sawi ang checksum ng tar, sira ang arkibo"
+msgstr "Bigo ang checksum ng tar, sira ang arkibo"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Di kilalang uri ng TAR header %u, miyembrong %s"
+msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr "Di tanggap na signature ng arkibo"
+msgstr "Hindi tanggap na signature ng arkibo"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
@@ -1396,7 +1443,7 @@ msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "Di tanggap na header ng miyembro ng arkibo"
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
@@ -1404,7 +1451,7 @@ msgstr "Bitin ang arkibo. Sobrang iksi."
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "Sawi ang pagbasa ng header ng arkibo"
+msgstr "Bigo ang pagbasa ng header ng arkibo"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
@@ -1412,11 +1459,11 @@ msgstr "Tinawagan ang DropNode sa naka-link pa na node"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr "Sawi sa paghanap ng elemento ng hash!"
+msgstr "Bigo sa paghanap ng elemento ng hash!"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr "Sawi ang pagreserba ng diversion"
+msgstr "Bigo ang pagreserba ng diversion"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
@@ -1435,17 +1482,17 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "Nadobleng tipunang conf %s/%s"
+msgstr "Nadobleng talaksang conf %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Sawi sa pagsulat ng tipunang %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr "Sawi sa pagsara ng tipunang %s"
+msgstr "Bigo sa pagsara ng talaksang %s"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
@@ -1478,7 +1525,7 @@ msgstr "Ang directory %s ay papalitan ng hindi-directory"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr "Sawi ang paghanap ng node sa kanyang hash bucket"
+msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
#: apt-inst/extract.cc:287
msgid "The path is too long"
@@ -1492,10 +1539,11 @@ msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Ang tipunang %s/%s ay pumapatong sa isang tipunan sa paketeng %s"
+msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -1508,7 +1556,7 @@ msgstr "Hindi ma-stat ang %s"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
-msgstr "Sawi sa pagtanggal ng %s"
+msgstr "Bigo sa pagtanggal ng %s"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
@@ -1518,32 +1566,32 @@ msgstr "Hindi malikha ang %s"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Sawi sa pag-stat ng %sinfo"
+msgstr "Bigo sa pag-stat ng %sinfo"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Sawi sa paglipat sa admin dir %sinfo"
+msgstr "Bigo sa paglipat sa admin dir %sinfo"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
msgstr "Internal error sa pagkuha ng pangalan ng pakete"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
-msgstr "Binabasa ang Tipunang Listahan"
+msgstr "Binabasa ang Talaksang Listahan"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1552,14 +1600,14 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Sawi sa pagbukas ng tipunang listahan '%sinfo/%s'. Kung hindi niyo maibalik "
-"ang tipunang ito, gawin itong walang laman at muling instolahin kaagad ang "
+"Bigo sa pagbukas ng talaksang listahan '%sinfo/%s'. Kung hindi niyo maibalik "
+"ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang "
"parehong bersyon ng pakete!"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Sawi sa pagbasa ng tipunang listahan %sinfo/%s"
+msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
@@ -1568,17 +1616,17 @@ msgstr "Internal error sa pagkuha ng Node"
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Sawi sa pagbukas ng tipunang diversions %sdiversions"
+msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr "Ang tipunang diversion ay sira"
+msgstr "Ang talaksang diversion ay sira"
#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr "Di tanggap na linya sa tipunang diversion: %s"
+msgstr "Di tanggap na linya sa talaksang diversion: %s"
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
@@ -1588,19 +1636,15 @@ msgstr "Internal error sa pagdagdag ng diversion"
msgid "The pkg cache must be initialized first"
msgstr "Ang cache ng pkg ay dapat ma-initialize muna"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Binabasa ang Tipunang Listahan"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Sawi sa paghanap ng Pakete: Header, offset %lu"
+msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Maling ConfFile section sa tipunang status. Offset %lu"
+msgstr "Maling ConfFile section sa talaksang status. Offset %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
@@ -1629,11 +1673,11 @@ msgstr "Internal error, hindi mahanap ang miyembro"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr "Sawi sa paghanap ng tanggap na tipunang control"
+msgstr "Bigo sa paghanap ng tanggap na talaksang control"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr "Di maintindihang tipunang control"
+msgstr "Di maintindihang talaksang control"
#: methods/cdrom.cc:114
#, c-format
@@ -1658,22 +1702,21 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Hindi Nahanap ang Tipunan"
+msgstr "Hindi nahanap ang Disk."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "Hindi Nahanap ang Tipunan"
+msgstr "Hindi Nahanap ang Talaksan"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
-msgstr "Sawi ang pag-stat"
+msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Sawi ang pagtakda ng oras ng pagbago"
+msgstr "Bigo ang pagtakda ng oras ng pagbago"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
@@ -1700,12 +1743,12 @@ msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "Sawi ang USER/GUMAGAMIT, sabi ng server ay: %s"
+msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "Sawi ang PASS, sabi ng server ay: %s"
+msgstr "Bigo ang PASS, sabi ng server ay: %s"
#: methods/ftp.cc:237
msgid ""
@@ -1718,12 +1761,12 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Sawi ang utos sa login script '%s', sabi ng server ay: %s"
+msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "Sawi ang TYPE, sabi ng server ay: %s"
+msgstr "Bigo ang TYPE, sabi ng server ay: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
@@ -1789,7 +1832,7 @@ msgstr "Di kilalang pamilya ng address %u (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "Sawi ang EPRT, sabi ng server ay: %s"
+msgstr "Bigo ang EPRT, sabi ng server ay: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
@@ -1799,14 +1842,14 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "Problema sa pag-hash ng tipunan"
+msgstr "Problema sa pag-hash ng talaksan"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Hindi makakuha ng tipunan, sabi ng server ay '%s'"
+msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
@@ -1815,14 +1858,14 @@ msgstr "Nag-timeout ang socket ng datos"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Sawi ang paglipat ng datos, sabi ng server ay '%s'"
+msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "Query"
+msgstr "Tanong"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Hindi ma-invoke "
@@ -1851,75 +1894,80 @@ msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Hindi maka-konek sa %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Kumokonek sa %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Hindi maresolba ang '%s'"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Pansamantalang kasawian sa pagresolba ng '%s'"
+msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Hindi maka-konek sa %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Hindi maresolba ang '%s'"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
+"Lalabas."
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
+"fingerprint?!"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "hindi makuha ang aldaba %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
+msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
+"available:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1931,89 +1979,89 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr "Naghihintay ng mga header"
+msgstr "Naghihintay ng panimula"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
+msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr "Maling linyang header"
+msgstr "Maling linyang panimula"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
-msgstr "Sawi ang pagpili"
+msgstr "Bigo ang pagpili"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr "Error sa pagsulat ng tipunang output"
+msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr "Error sa pagsulat sa tipunan"
+msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr "Error sa pagsusulat sa tipunan"
+msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr "Maling datos sa header"
+msgstr "Maling datos sa panimula"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr "Sawi ang koneksyon"
+msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internal na error"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr "Hindi mai-mmap ang tipunang walang laman"
+msgstr "Hindi mai-mmap ang talaksang walang laman"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2026,7 +2074,7 @@ msgstr "Hindi kilalang katagang uri: '%c'"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr "Binubuksan ang tipunang pagsasaayos %s"
+msgstr "Binubuksan ang talaksang pagsasaayos %s"
#: apt-pkg/contrib/configuration.cc:512
#, c-format
@@ -2072,7 +2120,7 @@ msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntax error %s:%u: May basura sa dulo ng tipunan"
+msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
#: apt-pkg/contrib/progress.cc:154
#, c-format
@@ -2087,40 +2135,40 @@ msgstr "%c%s... Tapos"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Option sa command line '%c' [mula %s] ay di kilala."
+msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr "Option sa command line %s ay di naintindihan."
+msgstr "Opsyon sa command line %s ay di naintindihan."
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "Option sa command line %s ay hindi boolean"
+msgstr "Opsyon sa command line %s ay hindi boolean"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr "Option %s ay nangangailangan ng argumento"
+msgstr "Opsyon %s ay nangangailangan ng argumento"
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
+"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
"=<halaga>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'"
+msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "Option '%s' ay labis ang haba"
+msgstr "Opsyon '%s' ay labis ang haba"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
@@ -2137,31 +2185,32 @@ msgstr "Di tanggap na operasyon %s"
msgid "Unable to stat the mount point %s"
msgstr "Di mai-stat ang mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Di makalipat sa %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr "Sawi sa pag-stat ng cdrom"
+msgstr "Bigo sa pag-stat ng cdrom"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-"Hindi ginagamit ang pagaldaba para sa basa-lamang na tipunang aldaba %s"
+"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
-msgstr "Hindi mabuksan ang tipunang aldaba %s"
+msgstr "Hindi mabuksan ang talaksang aldaba %s"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-"Hindi gumagamit ng pag-aldaba para sa tipunang aldaba %s na naka-mount sa nfs"
+"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
+"nfs"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
@@ -2191,7 +2240,7 @@ msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
-msgstr "Hindi mabuksan ang tipunang %s"
+msgstr "Hindi mabuksan ang talaksang %s"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
@@ -2205,15 +2254,15 @@ msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr "Problema sa pagsara ng tipunan"
+msgstr "Problema sa pagsara ng talaksan"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr "Problema sa pag-unlink ng tipunan"
+msgstr "Problema sa pag-unlink ng talaksan"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr "Problema sa pag-sync ng tipunan"
+msgstr "Problema sa pag-sync ng talaksan"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
@@ -2221,11 +2270,11 @@ msgstr "Walang laman ang cache ng pakete"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr "Sira ang tipunan ng cache ng pakete"
+msgstr "Sira ang talaksan ng cache ng pakete"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr "Ang tipunan ng cache ng pakete ay hindi magamit na bersyon"
+msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon"
#: apt-pkg/pkgcache.cc:142
#, c-format
@@ -2254,7 +2303,7 @@ msgstr "Rekomendado"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr "Conflict"
+msgstr "Tunggali"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
@@ -2284,77 +2333,92 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "Ginagawa ang puno ng mga dependensiya"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "Bersyong Kandidato"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "Pagbuo ng Dependensiya"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "Hindi ma-parse ang tipunang pakete %s (1)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "Hindi ma-parse ang tipunang pakete %s (2)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s."
+msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (uri)"
+msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Di kilalang uri '%s' sa linyang %u sa tipunang pagkukunan %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (vendor id)"
+msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2371,9 +2435,9 @@ msgstr ""
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng tipunang index na '%s'"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2381,7 +2445,7 @@ msgstr ""
"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
"para dito."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2389,7 +2453,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
"ito ng mga paketeng naka-hold."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
@@ -2404,10 +2468,17 @@ msgstr "Nawawala ang directory ng talaan %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Nawawala ang directory ng arkibo %spartial."
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Binabasa ang Talaksang Listahan"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2419,20 +2490,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
msgid "Method %s did not start correctly"
msgstr "Hindi umandar ng tama ang paraang %s"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Pagpalit ng Media: Ikasa ang disk na may pangalang\n"
-" '%s'\n"
-"sa drive '%s' at pindutin ang enter\n"
+"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2448,7 +2517,7 @@ msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng tipunang estado."
+"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado."
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
@@ -2458,7 +2527,7 @@ msgstr ""
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
-msgstr "Di tanggap na record sa tipunang pagtatangi, walang Package header"
+msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
#: apt-pkg/policy.cc:291
#, c-format
@@ -2469,123 +2538,127 @@ msgstr "Hindi naintindihan ang uri ng pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "Hindi akma ang versioning system ng cache"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
-msgstr "Kinukuha ang Tipunang Provides"
+msgstr "Kinukuha ang Talaksang Provides"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)."
+msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin "
+"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin "
+"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa "
+"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2632,7 +2705,7 @@ msgstr "Sinasalang ang CD-ROM...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr "Sinisiyasat ang Disc para sa tipunang index...\n"
+msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
#: apt-pkg/cdrom.cc:647
#, c-format
@@ -2678,73 +2751,89 @@ msgstr "Nagsulat ng %i na record.\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "Nagsulat ng %i na record na may %i na tipunang kulang.\n"
+msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Nagsulat ng %i na record na may %i na tipunang mismatch\n"
+msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-"Nagsulat ng %i na record na may %i na tipunang kulang at %i na tipunang "
+"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
"mismatch\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Binubuksan %s"
+msgstr "Hinahanda ang %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Binubuksan %s"
+msgstr "Binubuklat ang %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Binubuksan ang tipunang pagsasaayos %s"
+msgstr "Hinahanda ang %s upang isaayos"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Kumokonek sa %s"
+msgstr "Isasaayos ang %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Naka-instol: "
+msgstr "Iniluklok ang %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Naghahanda para sa pagtanggal ng %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Binubuksan %s"
+msgstr "Tinatanggal ang %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Rekomendado"
+msgstr "Tinanggal ang %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Hinahanda ang %s upang isaayos"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Bigo sa pagtanggal ng %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Nagsara ng maaga ang koneksyon"
+#~ msgid "File date has changed %s"
+#~ msgstr "Nagbago ang petsa ng talaksang %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Binabasa ang Talaksang Listahan"
+
+#~ msgid "Could not execute "
+#~ msgstr "Hindi ma-execute ang "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Tinanggal ang %s kasama ang pagkasaayos nito"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s"
+#~ msgstr ""
+#~ "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s"
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 000000000..f97dc97e4
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,2854 @@
+# Vietnamese Translation for Apt.
+# This file is put in the public domain.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-05-19 22:19+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.5.5b43u\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Gói %s phiên bản %s phụ thuá»™c vào phần má»m chÆ°a có :\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Không thể định vị gói %s"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "Tổng tên gói: "
+
+#: cmdline/apt-cache.cc:272
+msgid " Normal packages: "
+msgstr " Gói bình thÆ°á»ng: "
+
+#: cmdline/apt-cache.cc:273
+msgid " Pure virtual packages: "
+msgstr " Gói ảo nguyên chất: "
+
+#: cmdline/apt-cache.cc:274
+msgid " Single virtual packages: "
+msgstr " Gói ảo đơn: "
+
+#: cmdline/apt-cache.cc:275
+msgid " Mixed virtual packages: "
+msgstr " Gói ảo đã pha trộn: "
+
+#: cmdline/apt-cache.cc:276
+msgid " Missing: "
+msgstr " Thiếu: "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "Tổng phiên bản riêng: "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "Tổng cách phụ thuộc: "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "Tổng cách liên quan phiên bản và tập tin: "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "Tổng cách ảnh xạ Miễn là: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "Tổng chỗ chưa dùng: "
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "Tổng chỗ sẽ dùng: "
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "Tập tin gói %s không đồng bộ được."
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "Bạn phải đưa ra đúng một mẫu"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "Không tìm thấy gói"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "Tập tin gói:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
+
+# Variable: do not translate/ biến: đừng dịch
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "Các gói đã ghim:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(không tìm thấy)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid " Installed: "
+msgstr " Äã cài đặt: "
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(không có)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid " Candidate: "
+msgstr " Ứng cử: "
+
+#: cmdline/apt-cache.cc:1532
+msgid " Package pin: "
+msgstr " Ghim gói: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid " Version table:"
+msgstr " Bảng phiên bản:"
+
+# Variable: do not translate/ biến: đừng dịch
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Cách sá»­ dụng: apt-cache [tùy_chá»n...] lệnh\n"
+" apt-cache [tùy_chá»n...] add tập_tin1 [tập_tin2 ...]\n"
+" apt-cache [tùy_chá»n...] showpkg gói1 [gói2 ...]\n"
+" apt-cache [tùy_chá»n...] showsrc gói1 [gói2 ...]\n"
+"(cache: \tbộ nhớ tạm;\n"
+"add: \tthêm;\n"
+"showpkg: hiển thị gói;\n"
+"showsrc: \thiển thị nguồn)\n"
+"\n"
+"apt-cache là một công cụ mức thấp dùng để thao tác\n"
+"những tập tin bộ nhớ tạm nhị phân của APT,\n"
+"và cũng để truy vấn thông tin từ những tập tin đó.\n"
+"\n"
+"Lệnh:\n"
+" add\t\t_Thêm_ gói vào bộ nhớ tạm nguồn\n"
+" gencaches\tXây dung (_tạo ra_) cả gói lẫn _bá»™ nhá»› tạm_ nguồn Ä‘á»u\n"
+" showpkg\t_Hiện_ một phần thông tin chung vỠmột _gói_ riêng lẻ\n"
+" showsrc\t_Hiện_ các mục ghi _nguồn_\n"
+" stats\t\tHiện một phần _thống kê_ cơ bản\n"
+" dump\t\tHiện toàn bộ tập tin dạng ngắn (_đổ_)\n"
+" dumpavail\tIn ra một tập tin _sẵn sàng_ vào thiết bị xuất chuẩn (_đổ_)\n"
+" unmet\t\tHiện các cách phụ thuộc _chưa thực hiện_\n"
+" search\t\t_Tìm kiếm_ mẫu biểu thức chính quy trong danh sách gói\n"
+" show\t\t_Hiệnị_ mục ghi có thể Ä‘á»c, cho những gói đó\n"
+" depends\tHiện thông tin cách _phụ thuộc_ thô cho gói\n"
+" rdepends\tHiện thông tin cách _phụ thuộc ngược lại_, cho gói\n"
+" pkgnames\tHiện danh sách _tên_ má»i _gói_\n"
+" dotty\t\tTạo ra đồ thị gói cho GraphVis (_nhiá»u chấm_)\n"
+" xvcg\t\tTạo ra đồ thị gói cho _xvcg_\n"
+" policy\t\tHiển thị các thiết lập _chính thức_\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t\t_Trợ giúp_ này\n"
+" -p=? \t\tBộ nhớ tạm _gói_.\n"
+" -s=? \t\tBộ nhớ tạm _nguồn_.\n"
+" -q \t\tTắt cái chỉ tiến trình (_im_).\n"
+" -i \t\tHiện chỉ những cách phụ thuá»™c _quan trá»ng_\n"
+"\t\t\tcho lệnh chưa thực hiện.\n"
+" -c=? \t\tÄá»c tập tin _cấu hình_ này\n"
+" -o=? \t\tLập má»™t tùy chá»n cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+"Äể tìm thông tin thêm thì bạn hãy xem hai trang « man » (hÆ°á»›ng dẫn)\n"
+"\t\t\tapt-cache(8) và apt.conf(5).\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Hãy cung cấp tên cho ÄÄ©a này, nhÆ° « Debian 2.1r1 ÄÄ©a 1 »"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Hãy lặp lại tiến trình này cho các ÄÄ©a còn lại trong bá»™ Ä‘Ä©a của bạn."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Không có các đối số dạng cặp"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sá»­ dụng: apt-config [tùy_chá»n...] lệnh\n"
+"\n"
+"[config: viết tắt cho từ configuration: cấu hình]\n"
+"\n"
+"apt-config là má»™t công cụ Ä‘Æ¡n giản để Ä‘á»c tập tin cấu hình APT.\n"
+"\n"
+"Lệnh:\n"
+" shell\t\tChế Ä‘á»™ _hệ vá»_\n"
+" dump\t\tHiển thị cấu hình (_đổ_)\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t\t_Trợ giúp_ này\n"
+" -c=? \t\tÄá»c tập tin cấu hình này\n"
+" -o=? \t\tLập má»™t tùy chá»n cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s không phải là một gói DEB hợp lệ."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[extract: \t\trút;\n"
+"templates: \tnhững biểu mẫu]\n"
+"\n"
+"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
+"\tvà biểu mẫu Ä‘á»u từ gói Debian\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t\t_Trợ giúp_ này\n"
+" -t \t\tLập thÆ° muc tạm thá»i\n"
+"\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thá»i]\n"
+" -c=? \t\tÄá»c tập tin cấu hình này\n"
+" -o=? \t\tLập má»™t tùy chá»n cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Không thể ghi vào %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+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:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "Danh sách mở rộng gói quá dài"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Gặp lỗi khi xử lý thư mục %s"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "Danh sách mở rộng nguồn quá dài"
+
+#: ftparchive/apt-ftparchive.cc:371
+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:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Gặp lỗi khi xử lý nội dung %s"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"Cách sá»­ dụng: apt-ftparchive [tùy_chá»n...] lệnh\n"
+"\n"
+"[ftparchive: FTP archive: kho FTP]\n"
+"\n"
+"Lệnh: \tpackages binarypath [tập_tin_đè [tiá»n_tố_Ä‘Æ°á»ng_dẫn]]\n"
+" \tsources srcpath [tập_tin_đè[tiá»n_tố_Ä‘Æ°á»ng_dẫn]]\n"
+" \tcontents path\n"
+" \trelease path\n"
+" \tgenerate config [groups]\n"
+" \tclean config\n"
+"\n"
+"[packages: \tnhững gói;\n"
+"binarypath: \tÄ‘Æ°á»ng dẫn nhị phân;\n"
+"sources: \t\tnhững nguồn;\n"
+"srcpath: \t\tÄ‘Æ°á»ng dẫn nguồn;\n"
+"contents path: Ä‘Æ°á»ng dẫn ná»™i dụng;\n"
+"release path: \tÄ‘Æ°á»ng dẫn bản đã phát hành;\n"
+"generate config [groups]: tạo ra cấu hình [nhóm];\n"
+"clean config: \tcấu hình toàn mới)\n"
+"\n"
+"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
+"Nó há»— trợ nhiá»u cách tạo ra, từ cách tá»± Ä‘á»™ng toàn bá»™\n"
+"đến cách thay thế Ä‘iá»u hoặt Ä‘á»™ng cho dpkg-scanpackages (dpkg-quét_gói)\n"
+"và dpkg-scansources (dpkg-quét_nguồn).\n"
+"\n"
+"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
+"Tập tin gói chứa ná»™i dung các trÆ°á»ng Ä‘iá»u khiển từ má»—i gói,\n"
+"cùng với băm MD5 và kích cỡ tập tin.\n"
+"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
+"\n"
+"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
+"Có thể sá»­ dụng tùy chá»n « --source-override » (đè nguồn)\n"
+"để ghi rõ tập tin đè nguồn\n"
+"\n"
+"Lnh « packages » (gói) và « sources » (nguồn) nên chạy tại gốc cây.\n"
+"BinaryPath (Ä‘Æ°á»ng dẫn nhị phân) nên chỉ tá»›i cÆ¡ bản của việc tìm kiếm đệ "
+"quy,\n"
+"và tập tin đè nên chứa những cỠđè.\n"
+"Pathprefix (tiá»n tố Ä‘Æ°á»ng dẫn) được phụ thêm vào\n"
+"những trÆ°á»ng tên tập tin nếu có.\n"
+"Cách sử dụng thí dụ từ kho Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t\t_Trợ giúp_ này\n"
+" --md5 \t\tÄiá»u khiển cách tạo ra MD5\n"
+" -s=? \t\tTập tin đè nguồn\n"
+" -q \t\t_Im_ (không xuất chi tiết)\n"
+" -d=? \t\tChá»n _cÆ¡ sở dữ liệu_ nhá»› tạm tùy chá»n\n"
+" --no-delink \tMở chế độ gỡ lỗi _bỠliên kết_\n"
+" --contents \tÄiá»u khiển cách tạo ra tập tin _ná»™i dung_\n"
+" -c=? \t\tÄá»c tập tin cấu hình này\n"
+" -o=? \t\tLập má»™t tùy chá»n cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "Không có Ä‘iá»u đã chá»n khá»›p được"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, 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:47
+#, 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:65
+#, 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 %s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
+#, 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:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
+
+#: ftparchive/cachedb.cc:242
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi Ä‘iá»u khiển"
+
+#: ftparchive/cachedb.cc:448
+msgid "Unable to get a cursor"
+msgstr "Không thể lấy con chạy"
+
+#: ftparchive/writer.cc:79
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Không thể Ä‘á»c thÆ° mục %s\n"
+
+#: ftparchive/writer.cc:84
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n"
+
+#: ftparchive/writer.cc:135
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:137
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:144
+msgid "E: Errors apply to file "
+msgstr "E: có lỗi áp dụng vào tập tin "
+
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Việc quyết định %s bị lỗi"
+
+#: ftparchive/writer.cc:173
+msgid "Tree walking failed"
+msgstr "Việc di chuyển qua cây bị lỗi"
+
+#: ftparchive/writer.cc:198
+#, c-format
+msgid "Failed to open %s"
+msgstr "Việc mở %s bị lỗi"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " BỠliên kết %s [%s]\n"
+
+#: ftparchive/writer.cc:265
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Việc tạo liên kết lại %s bị lỗi"
+
+#: ftparchive/writer.cc:269
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Việc bỠliên kết %s bị lỗi"
+
+#: ftparchive/writer.cc:276
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Việc liên kết %s đến %s bị lỗi"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Hết hạn bỠliên kết của %sB.\n"
+
+#: ftparchive/writer.cc:390
+msgid "Archive had no package field"
+msgstr "Kho không có trÆ°á»ng gói"
+
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s không có mục ghi đè\n"
+
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " ngÆ°á»i bảo quản %s là %s không phải %s\n"
+
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s không có mục ghi đè\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s không có mục ghi đè\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không thể mở %s"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Äiá»u đè dạng sai %s dòng %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Äiá»u đè dạng sai %s dòng %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Äiá»u đè dạng sai %s dòng %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Việc Ä‘á»c tập tin đè %s bị lá»—i"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Không biết thuật toán nén « %s »"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "Việc tạo tiến trình con bị lỗi"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "Nén Ä‘iá»u con"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Lỗi nội bộ, việc tạo %s bị lỗi"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "Việc tạo tiến trình con IPC bị lỗi"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "Việc thực hiện bô nén bị lỗi "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "bộ giải nén"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "Việc Ä‘á»c khi tính MD5 bị lá»—i"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gặp lỗi khi bỠliên kết %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Việc đổi tên %s thành %s bị lỗi"
+
+#: cmdline/apt-get.cc:121
+msgid "Y"
+msgstr "C"
+
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Lỗi biên dich biểu thức chính quy - %s"
+
+#: cmdline/apt-get.cc:238
+msgid "The following packages have unmet dependencies:"
+msgstr "Những gói theo đây phụ thuá»™c vào phần má»m chÆ°a có :"
+
+#: cmdline/apt-get.cc:328
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà %s đã được cài đặt"
+
+#: cmdline/apt-get.cc:330
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: cmdline/apt-get.cc:337
+msgid "but it is not installable"
+msgstr "nhưng mà nó không có khả năng cài đặt"
+
+#: cmdline/apt-get.cc:339
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not installed"
+msgstr "nhưng mà nó chưa được cài đặt"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not going to be installed"
+msgstr "nhưng mà nó sẽ không được cài đặt"
+
+#: cmdline/apt-get.cc:347
+msgid " or"
+msgstr " hay"
+
+#: cmdline/apt-get.cc:376
+msgid "The following NEW packages will be installed:"
+msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
+
+#: cmdline/apt-get.cc:402
+msgid "The following packages will be REMOVED:"
+msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
+
+#: cmdline/apt-get.cc:424
+msgid "The following packages have been kept back:"
+msgstr "Theo đây có những gói đã được giữ lại:"
+
+#: cmdline/apt-get.cc:445
+msgid "The following packages will be upgraded:"
+msgstr "Theo đây có những gói sẽ được nâng cấp:"
+
+#: cmdline/apt-get.cc:466
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
+
+#: cmdline/apt-get.cc:486
+msgid "The following held packages will be changed:"
+msgstr "Theo đây có những gói sẽ được thay đổi:"
+
+#: cmdline/apt-get.cc:539
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (do %s) "
+
+#: cmdline/apt-get.cc:547
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"CẢNH BÃO : theo đây có những gói chủ yếu sẽ bị gỡ bá».\n"
+"ÄỪNG làm nhÆ° thế trừ khi bạn biết làm gì ở đây nó má»™t cách chính xác."
+
+#: cmdline/apt-get.cc:578
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
+
+#: cmdline/apt-get.cc:582
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: cmdline/apt-get.cc:584
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu được hạ cấp, "
+
+#: cmdline/apt-get.cc:586
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu cần gỡ bá», và %lu chÆ°a được nâng cấp.\n"
+
+#: cmdline/apt-get.cc:590
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu chÆ°a được cài đặt toàn bá»™ hay được gỡ bá».\n"
+
+#: cmdline/apt-get.cc:650
+msgid "Correcting dependencies..."
+msgstr "Äang sá»­a cách phụ thuá»™c..."
+
+#: cmdline/apt-get.cc:653
+msgid " failed."
+msgstr " đã thất bại."
+
+#: cmdline/apt-get.cc:656
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa cách phụ thuộc"
+
+#: cmdline/apt-get.cc:659
+msgid "Unable to minimize the upgrade set"
+msgstr "Không thể cực tiểu hóa bộ nâng cấp"
+
+#: cmdline/apt-get.cc:661
+msgid " Done"
+msgstr " Äã xong"
+
+#: cmdline/apt-get.cc:665
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
+
+#: cmdline/apt-get.cc:668
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+"Còn có cách phụ thuá»™c vào phần má»m chÆ°a có. NhÆ° thế thì bạn hãy cố dùng tùy "
+"chá»n « -f »."
+
+#: cmdline/apt-get.cc:690
+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."
+
+#: cmdline/apt-get.cc:694
+msgid "Authentication warning overridden.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
+
+#: cmdline/apt-get.cc:701
+msgid "Install these packages without verification [y/N]? "
+msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
+
+#: cmdline/apt-get.cc:703
+msgid "Some packages could not be authenticated"
+msgstr "Một số gói không thể được xác thực"
+
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Gập lá»—i và đã dùng tùy chá»n « -y » mà không có « --force-yes »"
+
+#: cmdline/apt-get.cc:756
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Lá»—i ná»™i bá»™: InstallPackages (cài đặt gói) được gá»i vá»›i gói bị há»ng."
+
+#: cmdline/apt-get.cc:765
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Cần phải gỡ bỠmột số gói, nhưng mà khả năng Gỡ bỠ(Remove) đã bị tắt."
+
+#: cmdline/apt-get.cc:776
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
+
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
+msgid "Unable to lock the download directory"
+msgstr "Không thể khóa thÆ° mục tải vá»"
+
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "Không thể Ä‘á»c danh sách nguồn."
+
+#: cmdline/apt-get.cc:817
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
+
+#: cmdline/apt-get.cc:822
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Cần phải lấy %sB/%sB kho.\n"
+
+#: cmdline/apt-get.cc:825
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Cần phải lấy %sB kho.\n"
+
+#: cmdline/apt-get.cc:830
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
+
+#: cmdline/apt-get.cc:833
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
+
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Không thể quyết định chỗ rảnh trong %s"
+
+#: cmdline/apt-get.cc:850
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
+
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+"Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
+
+#: cmdline/apt-get.cc:867
+msgid "Yes, do as I say!"
+msgstr "Có, làm đi."
+
+#: cmdline/apt-get.cc:869
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Bạn sắp làm gì có thể có hai.\n"
+"Äể tiếp tục thì hãy gõ cụm từ « %s »\n"
+"?]"
+
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
+msgid "Abort."
+msgstr "Hủy bá»."
+
+#: cmdline/apt-get.cc:890
+msgid "Do you want to continue [Y/n]? "
+msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
+
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "Việc gói %s bị lỗi %s\n"
+
+#: cmdline/apt-get.cc:980
+msgid "Some files failed to download"
+msgstr "Một số tập tin không tải vỠđược"
+
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
+msgid "Download complete and in download only mode"
+msgstr "Má»›i tải vá» xong và trong chế Ä‘á»™ chỉ tải vá»"
+
+#: cmdline/apt-get.cc:987
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
+"cập nhật) hay cố vá»›i « --fix-missing » (sá»­a các Ä‘iá»u còn thiếu) không?"
+
+#: cmdline/apt-get.cc:991
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"ChÆ°a hô trợ tùy chá»n « --fix-missing » (sá»­a khi thiếu Ä‘iá»u) và trao đổi "
+"phương tiện."
+
+#: cmdline/apt-get.cc:996
+msgid "Unable to correct missing packages."
+msgstr "Không thể sửa những gói còn thiếu."
+
+#: cmdline/apt-get.cc:997
+msgid "Aborting install."
+msgstr "Äang hủy bá» cài đặt."
+
+#: cmdline/apt-get.cc:1031
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Ghi chú : Ä‘ang chá»n %s thay vì %s\n"
+
+#: cmdline/apt-get.cc:1041
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Äang bá» qua %s vì nó đã được cài đặt và chÆ°a lập tùy chá»n Nâng cấp.\n"
+
+#: cmdline/apt-get.cc:1059
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỠnó\n"
+
+#: cmdline/apt-get.cc:1070
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Gói %s là gói ảo được cung cấp do :\n"
+
+#: cmdline/apt-get.cc:1082
+msgid " [Installed]"
+msgstr " [Äã cài đặt]"
+
+#: cmdline/apt-get.cc:1087
+msgid "You should explicitly select one to install."
+msgstr "Bạn nên chá»n má»™t cách dứt khoát gói cần cài."
+
+#: cmdline/apt-get.cc:1092
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Gói %s không phải sẵn sàng, nhưng mà một gói khác\n"
+"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
+"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
+
+#: cmdline/apt-get.cc:1111
+msgid "However the following packages replace it:"
+msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
+
+#: cmdline/apt-get.cc:1114
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Gói %s không có ứng cử cài đặt"
+
+#: cmdline/apt-get.cc:1134
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Không thể cài đặt lại %s vì không thể tải vỠnó.\n"
+
+#: cmdline/apt-get.cc:1142
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
+
+#: cmdline/apt-get.cc:1171
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
+
+#: cmdline/apt-get.cc:1173
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
+
+#: cmdline/apt-get.cc:1179
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Äã chá»n phiên bản %s (%s) cho %s\n"
+
+#: cmdline/apt-get.cc:1316
+msgid "The update command takes no arguments"
+msgstr "Lệnh cập nhật không chấp nhật đối số"
+
+#: cmdline/apt-get.cc:1329
+msgid "Unable to lock the list directory"
+msgstr "Không thể khóa thư mục danh sách"
+
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Má»™t số tập tin chỉ mục không tải vỠđược, đã bá» qua chúng, hoặc Ä‘iá»u cÅ© được "
+"dùng thay thế."
+
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trÆ°á»ng hợp:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đỠđã ngắt gì"
+
+#: cmdline/apt-get.cc:1463
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
+
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Không tìm thấy gói %s"
+
+#: cmdline/apt-get.cc:1584
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Ghi chú : Ä‘ang chá»n %s cho biểu thức chính quy « %s »\n"
+
+#: cmdline/apt-get.cc:1614
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
+
+#: cmdline/apt-get.cc:1617
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Gói còn phụ thuá»™c vào phần má»m chÆ°a có. Hãy cố chạy lệnh « apt-get -f "
+"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
+
+#: cmdline/apt-get.cc:1629
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Không thể cài đặt một số gói. Có lẽ có nghĩa là bạn đa yêu cầu\n"
+"má»™t trÆ°á»ng hợp không thể, hoặc nếu bạn sá»­ dụng bản phân phối\n"
+"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
+"hoặc chÆ°a di chuyển chúng ra phần Incoming (Äến)."
+
+#: cmdline/apt-get.cc:1637
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n"
+"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
+"thông báo lỗi vỠgói này."
+
+#: cmdline/apt-get.cc:1645
+msgid "Broken packages"
+msgstr "Gói bị ngắt"
+
+#: cmdline/apt-get.cc:1676
+msgid "The following extra packages will be installed:"
+msgstr "Những gói thêm theo đây sẽ được cài đặt:"
+
+#: cmdline/apt-get.cc:1765
+msgid "Suggested packages:"
+msgstr "Gói được đệ nghị:"
+
+#: cmdline/apt-get.cc:1766
+msgid "Recommended packages:"
+msgstr "Gói được khuyên:"
+
+#: cmdline/apt-get.cc:1786
+msgid "Calculating upgrade... "
+msgstr "Äang tính nâng cấp... "
+
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "Bị lỗi"
+
+#: cmdline/apt-get.cc:1794
+msgid "Done"
+msgstr "Xong"
+
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
+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:1969
+msgid "Must specify at least one package to fetch source for"
+msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
+
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
+#, 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:2043
+#, 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:2067
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Không đủ sức chứa còn rảnh trong %s"
+
+#: cmdline/apt-get.cc:2072
+#, 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"
+
+#: cmdline/apt-get.cc:2075
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Cần phải lấy %sB kho nguồn.\n"
+
+#: cmdline/apt-get.cc:2081
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Lấy nguồn %s\n"
+
+#: cmdline/apt-get.cc:2112
+msgid "Failed to fetch some archives."
+msgstr "Việc lấy một số kho bị lỗi."
+
+#: cmdline/apt-get.cc:2140
+#, 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:2152
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Lệnh giải nén « %s » bị lỗi.\n"
+
+#: cmdline/apt-get.cc:2153
+#, 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 cài đặt chưa.\n"
+
+#: cmdline/apt-get.cc:2170
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
+
+#: cmdline/apt-get.cc:2189
+msgid "Child process failed"
+msgstr "Tiến trình con bị lỗi"
+
+#: cmdline/apt-get.cc:2205
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
+
+#: cmdline/apt-get.cc:2233
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Không thể lấy thông tin vỠcách phụ thuộc khi xây dụng cho %s"
+
+#: cmdline/apt-get.cc:2253
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
+
+#: cmdline/apt-get.cc:2305
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "cách phụ thuá»™c %s cho %s không thể được thá»a vì không tìm thấy gá»i %s"
+
+#: cmdline/apt-get.cc:2357
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"cách phụ thuá»™c %s cho %s không thể được thá»a vì không có phiên bản sẵn sàng "
+"của gói %s có thể thá»a Ä‘iá»u kiện phiên bản."
+
+#: cmdline/apt-get.cc:2392
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Việc cố thá»a cách phụ thuá»™c %s cho %s bị lá»—i vì gói đã cài đặt %s quá má»›i"
+
+#: cmdline/apt-get.cc:2417
+#, 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:2431
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Không thể thá»a cách phụ thuá»™c khi xây dụng cho %s."
+
+#: cmdline/apt-get.cc:2435
+msgid "Failed to process build dependencies"
+msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
+
+#: cmdline/apt-get.cc:2467
+msgid "Supported modules:"
+msgstr "Mô-đun đã hỗ trợ :"
+
+#: cmdline/apt-get.cc:2508
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"Cách sá»­ dụng: apt-get [tùy_chá»n...] lệnh\n"
+" apt-get [tùy_chá»n...] install|remove gói1 [gói2 ...]\n"
+" apt-get [tùy_chá»n...] source gói1 [gói2 ...]\n"
+"\n"
+"[get: \tlấy\n"
+"install: \tcài đặt\n"
+"remove: \tgỡ bá»\n"
+"source: \tnguồn]\n"
+"\n"
+"apt-get là một giao diện dòng lệnh đơn giản để tải vỠvà cài đặt gói.\n"
+"Những lệnh đã dùng thÆ°á»ng nhất là update (cập nhật) và install (cài đặt).\n"
+"\n"
+"Lệnh:\n"
+" update\t\tLấy danh sách gói mới (_cập nhật_)\n"
+" upgrade \t_Nâng cập_ \n"
+" install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n"
+" remove \t_Gỡ bá»_ gói\n"
+" source \t\tTải vỠkho _nguồn_\n"
+" build-dep \tÄịnh cấu hình _cách phụ thuá»™c khi xây dụng_, cho gói nguồn\n"
+" dist-upgrade \t_Nâng cấp bản phân phối_,\n"
+"\t\t\t\t\thãy xem trang hướng dẫn (man) apt-get(8)\n"
+" dselect-upgrade \t\tTheo cách chá»n dselect (_nâng cấp_)\n"
+" clean \t\tXóa bỠcác tập tin kho đã tải vỠ(_làm sạch_)\n"
+" autoclean \tXóa bỠcác tập tin kho cũ đã tải vỠ(_tự động làm sạch_)\n"
+" check \t\t_Kiểm chứng_ không có cách phụ thuộc bị ngắt\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t_Trợ giúp_ này.\n"
+" -q \tDữ liệu xuất có thể ghi lưu - không có cái chỉ tiến trình (_im_)\n"
+" -qq \tKhông xuất thông tin nào, trừ lỗi (_im im_)\n"
+" -d \tChỉ _tải vá»_, ÄỪNG cài đặt hay giải nén kho\n"
+" -s \tKhông hoạt đông. _Mô phá»ng_ sắp xếp\n"
+" -y \tGiả sá»­ trả lá»i _Có_ (yes) má»i khi gặp câu há»i;\n"
+"\t\t\t\t\tđừng nhắc ngÆ°á»i dùng gõ gì\n"
+" -f \t\tCố tiếp tục lại nếu việc kiểm tra tính nguyên vẹn _thất bại_\n"
+" -m \tCố tiếp tục lại nếu không thể định vị kho\n"
+" -u \tCũng hiện danh sách các gói đã _nâng cấp_\n"
+" -b \t_Xây dụng_ gói nguồn sau khi lấy nó\n"
+" -V \tHiện số thứ tự _phiên bản chi tiết_\n"
+" -c=? \tÄá»c tập tin cấu hình ấy\n"
+" -o=? \tLập tùy chá»n nhiệm ý, v.d. -o dir::cache=/tmp\n"
+"Äể tim thông tin và tùy chá»n thêm thì hãy xem trang hÆ°á»›ng dẫn apt-get(8), "
+"sources.list(5) và apt.conf(5).\n"
+" Trình APT này có năng lực của bò siêu.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Lần tìm "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Lấy:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Bá»q "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Lá»—i "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Mới lấy %sB trong %s (%sB/g).\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Hoạt động]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Chuyển đổi vật chứa: hãy nạp đĩa có nhãn\n"
+" « %s »\n"
+"vào ổ « %s » và bấm nút Enter\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Không biết mục ghi gói."
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sá»­ dụng: apt-sortpkgs [tùy_chá»n...] tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[sortpkgs: sort packages: sắp xếp các gói]\n"
+"\n"
+"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
+"Tùy chon « -s » dùng để ngụ ý kiểu tập tin.\n"
+"\n"
+"Tùy chá»n:\n"
+" -h \t_Trợ giúp_ này\n"
+" -s \tSắp xếp những tập tin _nguồn_\n"
+" -c=? \tÄá»c tập tin cấu hình này\n"
+" -o=? \tLập tùy chá»n cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Thiết lập mặc định sai."
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Hãy bấm phím Enter để tiếp tục lại."
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+"hoặc lá»—i khi không có phần má»m mà gói khác phụ thuá»™c vào nó. Không có sao, "
+"chỉ những lỗi"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"ở trên thông Ä‘iệp này là quan trá»ng. Hãy sá»­a chúng và chạy lại [I]nstall "
+"(cài đặt)"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Äang hợp nhất các thông tin sẵn sàng..."
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Việc tạo những ống bị lỗi"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "Việc thực hiện gzip bị lỗi "
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
+msgid "Corrupted archive"
+msgstr "Kho bị há»ng."
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị há»ng."
+
+#: apt-inst/contrib/extracttar.cc:299
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "Chữ ký kho không hợp lệ"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "Gặp lá»—i khi Ä‘á»c phần đầu bá»™ phạn kho"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Phần đầu bộ phạn kho không hợp lê"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "Kho quá ngắn"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "Việc Ä‘á»c phần đầu kho bị lá»—i"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "DropNode (thả Ä‘iểm nút) được gá»i vá»›i Ä‘iểm nút còn liên kết"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "Việc định vi phần tử băm bị lỗi"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "Việc cấp phát sự trệch đi bị lỗi"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Äang cố ghi đè má»™t sá»± trệch Ä‘i, %s → %s và %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Tập tin cấu hình trùng %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Việc đóng tập tin %s bị lỗi"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "ÄÆ°á»ng dẫn %s quá dài"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Äang giải nén %s nhiá»u lần"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Thư mục %s bị trệch hướng"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "ÄÆ°á»ng dẫn trệch Ä‘i quá dài."
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ThÆ° mục %s Ä‘ang được thay thế do Ä‘iá»u không phải là thÆ° mục"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "ÄÆ°á»ng dẫn quá dài"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Tập tin %s/%s ghi đè lên Ä‘iá»u trong gói %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "Không thể Ä‘á»c %s"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Không thể lấy các thông tin vỠ%s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Việc gỡ bỠ%s bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Không thể tạo %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Việc lấy các thông tin vỠ%sinfo bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Những thÆ° mục info (thông tin) và temp (tạm thá»i) cần phải trong cùng má»™t hệ "
+"thống tập tin"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
+msgid "Reading package lists"
+msgstr "Äang Ä‘á»c các danh sách gói..."
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Gặp lỗi nội bộ khi lấy tên gói"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Äang Ä‘á»c danh sách tập tin..."
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi "
+"tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói."
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Việc Ä‘á»c tập tin danh sách %sinfo/%s bị lá»—i"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Gặp lỗi nội bộ khi lấy nút điểm..."
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Tập tin trệch Ä‘i bị há»ng"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr ""
+"Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Äây không phải là môt kho DEB hợp lệ vì còn thiếu bá»™ phạn « %s »"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr ""
+"Äây không phải là môt kho DEB hợp lệ vì không có bá»™ phạn « %s » hay « %s »"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Không thể chuyển đổi sang %s"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "Việc định vị tập tin Ä‘iá»u khiển hợp lệ bị lá»—i"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "Tập tin Ä‘iá»u khiển không có khả năng phân tách"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Không thể Ä‘á»c cÆ¡ sở dữ liệu Ä‘Ä©a CD-ROM %s"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không "
+"thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "CD không đúng"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng."
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "Không tìm thấy đĩa"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Không tìm thấy tập tin"
+
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "Việc lấy các thông tin bị lỗi"
+
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "Việc lập giỠsửa đổi bị lỗi"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Äịa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu vá»›i « // »"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Äang đăng nhập..."
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Không thể quyết định tên ngang hàng"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Không thể quyết định tên cục bộ"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Lệnh USER (ngÆ°á»i dùng) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Äã ghi rõ máy phục vụ ủy nhiệm, nhÆ°ng mà chÆ°a ghi rõ tập lệnh đăng nhập. « "
+"Acquire::ftp::ProxyLogin » là rỗng."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Thá»i hạn kết nối"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Máy phục vụ đã đóng kết nối"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Lá»—i Ä‘á»c"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Má»™t trả lá»i đã tràn bá»™ đệm."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Giao thức bị há»ng"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Lá»—i ghi"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Không thể tạo ổ cắm"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giá»"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "Không thể kết nối ổ cắm bị động."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Không thể đóng kết ổ cắm"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Không thể lắng nghe trên ổ cắm đó"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Không thể quyết định tên ổ cắm đó"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Không thể gởi lệnh PORT (cổng)"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Không biết nhóm địa chỉ %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Kết nối ổ cắm dữ liệu đã quá giá»"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Không thể chấp nhận kết nối"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Gặp khó khăn băm tập tin"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "á»” cắm dữ liệu đã quá giá»"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Việc truyá»n dữ liệu bị lá»—i: máy phục vụ nói « %s »"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Truy vấn"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "Không thể gá»i "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Äang kết nối đến %s (%s)..."
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[Äịa chỉ IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giá»"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Không thể kết nối đến %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Äang kết nối đến %s..."
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Không thể tháo gỡ « %s »"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Việc tháo gỡ « %s » bị lá»—i tạm thá»i"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Gặp lá»—i nghiệm trá»ng khi tháo gỡ « %s:%s » (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Không thể kết nối đến %s %s:"
+
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Không thể truy cập vòng khoá « %s »"
+
+#: methods/gpgv.cc:100
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
+
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
+
+#: methods/gpgv.cc:209
+msgid "At least one invalid signature was encountered."
+msgstr "Gặp ít nhất một chữ ký không hợp lệ."
+
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Không thể thực hiện « %s » để kiểm chứng chữ ký (gnupg có được cài đặt chưa?)"
+
+#: methods/gpgv.cc:218
+msgid "Unknown error executing gpgv"
+msgstr "Gặp lỗi lạ khi thực hiện gpgv"
+
+#: methods/gpgv.cc:249
+msgid "The following signatures were invalid:\n"
+msgstr "Những chữ ký theo đây là không hợp lệ:\n"
+
+#: methods/gpgv.cc:256
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Không thể mở ống dẫn cho %s"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "Gặp lá»—i Ä‘á»c từ tiến trình %s"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "Äang đợi những phần đầu..."
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Äã lấy má»™t dòng đầu riêng lẻ chứa hÆ¡n %u ky tá»±"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "Dòng đầu sai"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Máy phục vụ HTTP đã gởi má»™t dòng đầu trả lá»i không hợp lệ"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr ""
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
+"hợp lệ"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr ""
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
+"hợp lệ"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "Không biết dạng ngày"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "Việc chá»n bị lá»—i"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "Kết nối đã quá giá»"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "Gặp lỗi khi ghi vào tập tin xuất"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "Gặp lỗi khi ghi vào tập tin"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "Gặp lỗi khi ghi vào tập tin đó"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gặp lá»—i khi Ä‘á»c từ máy phục vụ : cuối ở xa đã đóng kết nối"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "Gặp lá»—i khi Ä‘á»c từ máy phục vụ"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "Dữ liệu dòng đầu sai"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "Kết nối bị ngắt"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "Gặp lỗi nội bộ"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chá»n %s"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Không nhận biết viết tắt kiểu: « %c »"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Äang mở tập tin cấu hình %s..."
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "Dòng %d quá dài (tối đa %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gặp lá»—i cú pháp %s:%u: quá nhiá»u Ä‘iá»u bao gồm lồng nhau"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Lá»—i."
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Xong"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Không biết tùy chá»n dòng lệnh « %c » [từ %s]."
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Không hiểu tùy chá»n dòng lệnh %s"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Tùy chá»n dòng lệnh %s không phải bun (đúng/không đúng)"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Tùy chá»n %s cần đến má»™t đối số."
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Tùy chá»n %s: đặc tả mục cấu hình phải có má»™t « =<giá_trị> »."
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Tùy chá»n %s cần đến má»™t đối số số nguyên, không phải « %s »"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Tùy chá»n « %s » quá dài"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)."
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Thao tác không hợp lệ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Không thể chuyển đổi sang %s"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ Ä‘á»c %s"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Không thể mở tập tin khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Không thể lấy khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Äã đợi %s nhÆ°ng mà chÆ°a gặp nó"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Tiến trình con %s đã trả lá»i mã lá»—i (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Tiến trình con %s đã thoát bất ngá»"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "Không thể mở tập tin %s"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "Ä‘á»c, còn cần Ä‘á»c %lu nhÆ°ng mà không có Ä‘iá»u còn lại"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "Gặp lỗi khi đóng tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "Gặp lỗi khi bỠliên kết tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "Bộ nhớ tạm gói rỗng"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "Tập tin bá»™ nhá»› tạm gói bị há»ng"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Trình APT này không há»— trợ hệ thống Ä‘iá»u khiển phiên bản « %s »"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "Phụ thuộc"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "Phụ thuộc trước"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "Äệ nghị"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "Khuyên"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "Xung Ä‘á»™t"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "Thay thế"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "Làm cũ"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "quan trá»ng"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "cần"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "chuẩn"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "tùy chá»n"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "thêm"
+
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+msgid "Building dependency tree"
+msgstr "Äang xây dụng cây cách phụ thuá»™c..."
+
+#: apt-pkg/depcache.cc:102
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
+
+#: apt-pkg/depcache.cc:131
+msgid "Dependency generation"
+msgstr "Tạo ra cách phụ thuộc"
+
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "Äang hợp nhất các thông tin sẵn sàng..."
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Việc mở %s bị lỗi"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Không thể phân tách tập tin gói %s (1)"
+
+#: apt-pkg/tagfile.cc:186
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Không thể phân tách tập tin gói %s (2)"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)."
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "Äang mở %s..."
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Dòng %u quá dài trong danh sách nguồn %s."
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s."
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỠtạm gói chủ yếu %s, do "
+"vong lăp Xung Ä‘á»™t/Phụ thuá»™c trÆ°á»›c. TrÆ°á»ng hợp này thÆ°á»ng xấu, nhÆ°ng mà nếu "
+"bạn thật sá»± muốn tiếp tục, có thể hoạt hóa tuy chá»n « APT::Force-LoopBreak "
+"» (buộc ngắt vòng lặp)."
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
+
+#: apt-pkg/algorithms.cc:245
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
+
+#: apt-pkg/algorithms.cc:1075
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Lá»—i: « pkgProblemResolver::Resolve » (bá»™ tháo gỡ vấn Ä‘á» gá»i::tháo gỡ) đã tạo "
+"ra nhiá»u chá»— ngắt, có lẽ má»™t số gói đã giữ lại đã gây ra trÆ°á»ng hợp này."
+
+#: apt-pkg/algorithms.cc:1077
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Không thể sá»­a vấn Ä‘á», bạn đã giữ lại má»™t số gói bị ngắt."
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "Thiếu thư mục danh sách « %spartial »."
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "Thiếu thư mục kho « %spartial »."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Äang lấy tập tin %li trên %li (%s còn lại)..."
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Äang lấy tập tin %li trên %li..."
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Không tìm thấy trình Ä‘iá»u khiển phÆ°Æ¡ng pháp %s."
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Phương pháp %s đã không bắt đầu cho đúng."
+
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
+
+#: apt-pkg/init.cc:122
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
+
+#: apt-pkg/init.cc:138
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Không thể lấy các thông tin vỠ%s."
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách "
+"nguồn)"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái."
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đỠnày"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr ""
+"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
+"(Gói)."
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Không hiểu kiểu ghim %s"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
+
+#: apt-pkg/pkgcachegen.cc:76
+msgid "Cache has an incompatible versioning system"
+msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
+
+#: apt-pkg/pkgcachegen.cc:119
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
+
+#: apt-pkg/pkgcachegen.cc:131
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
+
+#: apt-pkg/pkgcachegen.cc:152
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
+
+#: apt-pkg/pkgcachegen.cc:156
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
+
+#: apt-pkg/pkgcachegen.cc:186
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)"
+
+#: apt-pkg/pkgcachegen.cc:190
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)"
+
+#: apt-pkg/pkgcachegen.cc:194
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
+
+#: apt-pkg/pkgcachegen.cc:209
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:212
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:215
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
+
+#: apt-pkg/pkgcachegen.cc:243
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
+
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr ""
+"Gặp lá»—i khi xá»­ lý %s (CollectFileProvides - tập hợp các trÆ°á»ng hợp miá»…n là "
+"một tập tin)"
+
+#: apt-pkg/pkgcachegen.cc:262
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
+
+#: apt-pkg/pkgcachegen.cc:577
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Không thể lấy các thông tin vỠdanh sách gói nguồn %s"
+
+#: apt-pkg/pkgcachegen.cc:662
+msgid "Collecting File Provides"
+msgstr "Äang tập hợp các trÆ°á»ng hợp « tập tin miá»…n là »"
+
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+msgid "IO Error saving source cache"
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum (tổng kiểm) không khớp được"
+
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
+
+#: apt-pkg/acquire-item.cc:759
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
+"này, do thiếu kiến trúc."
+
+#: apt-pkg/acquire-item.cc:818
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
+"này."
+
+#: apt-pkg/acquire-item.cc:854
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Các tập tin chỉ mục của gói này bị há»ng. Không có trÆ°á»ng Filename: (Tên tập "
+"tin:) cho gói %s."
+
+#: apt-pkg/acquire-item.cc:941
+msgid "Size mismatch"
+msgstr "Kích cỡ không khớp được"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Khối nhà bán %s không chứa vân tay"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Äang dùng Ä‘iểm lắp Ä‘Ä©a CD-ROM %s\n"
+"Äang lắp Ä‘Ä©a CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "Äang nhận diện... "
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "Nhãn đã lưu : %s\n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Äang dùng Ä‘iểm lắp Ä‘Ä©a CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "Äang tháo lắp Ä‘Ä©a CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "Äang đợi Ä‘Ä©a...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "Äang lắp Ä‘Ä©a CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "Äang quét Ä‘Ä©a tìm tập tin chỉ mục...\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Tên đĩa này:\n"
+"%s\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "Äang sao chép các danh sách gói..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "Äang ghi danh sách nguồn má»›i...\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "Äang tháo lắp Ä‘Ä©a CD-ROM..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "Mới ghi %i mục ghi.\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
+"nhau\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "Äang chuẩn bị %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "Äang mở gói %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Äang chuẩn bị cấu hình %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "Äang cấu hình %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "Äã cài đặt %s"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Äang chuẩn bị gỡ bá» %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "Äang gỡ bá» %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "Äã gỡ bá» %s"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Äang chuẩn bị gỡ bá» hoàn toàn %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Completely removed %s"
+msgstr "Mới gỡ bỠhoàn toàn %s"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Kết nối bị đóng quá sớm."
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Ngày tập tin đã đổi %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Äang Ä‘á»c danh sách tâp tin..."
+
+#~ msgid "Could not execute "
+#~ msgstr "Không thể thực hiện "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Äang chuẩn bị gỡ bá» vá»›i cấu hình %s..."
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Mới gỡ bỠvới cấu hình %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a4759955..c76a4abd9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,16 @@
# Chinese/Simplified translation of apt.
# This file is put in the public domain.
-# Tchaikov <chaisave@263.net>, 2004.
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
+# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-02-09 17:34+0800\n"
-"Last-Translator: Tchaikov <chaisave@263.net>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"PO-Revision-Date: 2006-02-22 14:20+1300\n"
+"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
+"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -146,14 +146,14 @@ msgstr " 版本列表:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s ,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -206,11 +206,11 @@ msgstr ""
" showsrc - 显示æºæ–‡ä»¶çš„å„项记录\n"
" stats - 显示一些基本的统计信æ¯\n"
" dump - 简è¦æ˜¾ç¤ºæ•´ä¸ªç¼“存文件的内容\n"
-" dumpavail - 把所有有效的包文件列表打å°åˆ° stdout\n"
+" dumpavail - 把所有有效的包文件列表打å°åˆ°æ ‡å‡†è¾“出\n"
" unmet - 显示所有未满足的ä¾èµ–关系\n"
" search - æ ¹æ®æ­£åˆ™è¡¨è¾¾å¼æœç´¢è½¯ä»¶åŒ…列表\n"
-" show - 显示关于该软件包的便于阅读的一个报告\n"
-" depends - 原原本本的显示该软件包的ä¾èµ–关系的信æ¯\n"
+" show - 以便于阅读的格å¼ä»‹ç»è¯¥è½¯ä»¶åŒ…\n"
+" depends - 原原本本地显示该软件包的ä¾èµ–ä¿¡æ¯\n"
" rdepends - 显示所有ä¾èµ–于该软件包的软件包åå­—\n"
" pkgnames - 列出所有软件包的åå­—\n"
" dotty - 生æˆå¯ç”¨ GraphVis 处ç†çš„软件包关系图\n"
@@ -227,6 +227,18 @@ msgstr ""
" -o=? 设置任æ„指定的é…置选项,例如 -o dir::cache=/tmp\n"
"è‹¥è¦æ·±å…¥äº†è§£ï¼Œæ‚¨è¿˜å¯ä»¥æŸ¥é˜… apt-cache(8) å’Œ apt.conf(5) å‚考手册。\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "请给这张光盘起个å字,比如说“Debian 2.1r1 Disk 1â€"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "请把光盘碟片æ’入驱动器å†æŒ‰å›žè½¦é”®"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "请对您的光盘套件中的其它光盘é‡å¤ç›¸åŒçš„æ“作。"
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "å‚数没有æˆå¯¹"
@@ -284,11 +296,11 @@ msgstr ""
"\n"
"选项:\n"
" -h 本帮助文本\n"
-" -t 设置temp目录\n"
+" -t 设置 temp 目录\n"
" -c=? 读指定的é…置文件\n"
" -o=? 设置任æ„指定的é…置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -322,7 +334,6 @@ msgid "Error processing contents %s"
msgstr "å¤„ç† Contents %s 时出错"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -372,8 +383,8 @@ msgstr ""
" clean é…置文件\n"
"\n"
"apt-ftparchive 被用æ¥ä¸º Debian 软件包生æˆç´¢å¼•æ–‡ä»¶ã€‚它能支æŒ\n"
-"多ç§ç”Ÿæˆç´¢å¼•çš„æ–¹å¼ï¼Œä»Žå…¨è‡ªåŠ¨çš„生æˆåˆ°åœ¨åŠŸèƒ½ä¸Šå¯¹ dpkg-scanpackages \n"
-"和 dpkg-scansources 的替代,都能游刃有余\n"
+"多ç§ç”Ÿæˆç´¢å¼•çš„æ–¹å¼ï¼Œä»Žå…¨è‡ªåŠ¨çš„索引生æˆåˆ°åœ¨åŠŸèƒ½ä¸Šå–代 dpkg-scanpackages \n"
+"和 dpkg-scansources,都能游刃有余\n"
"\n"
"apt-ftparchive 能ä¾æ®ä¸€ä¸ªç”± .deb 文件构æˆçš„æ–‡ä»¶æ ‘ç”Ÿæˆ Package 文件。\n"
"Package 文件里ä¸ä»…注有æ¯ä¸ªè½¯ä»¶åŒ…çš„ MD5 校验ç å’Œæ–‡ä»¶å¤§å°ï¼Œ\n"
@@ -394,7 +405,8 @@ msgstr ""
" -h 本帮助文档\n"
" --md5 ä½¿ä¹‹ç”Ÿæˆ MD5 校验和\n"
" -s=? æºä»£ç åŒ… override 文件\n"
-" -q è¾“å‡ºç²¾ç®€ä¿¡æ¯ -d=? 指定å¯é€‰çš„缓存数æ®åº“\n"
+" -q 输出精简信æ¯\n"
+" -d=? 指定å¯é€‰çš„缓存数æ®åº“\n"
" -d=? 使用å¦ä¸€ä¸ªå¯é€‰çš„缓存数æ®åº“\n"
" --no-delink å¼€å¯delink的调试模å¼\n"
" --contents 使之生æˆæŽ§åˆ¶å†…容文件\n"
@@ -410,115 +422,126 @@ msgstr "没有任何选定项是匹é…çš„"
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%sâ€ä¸­ç¼ºå°‘一些文件"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "缓存数æ®åº“被æŸå了,该数æ®åº“文件的文件åå·²æ”¹æˆ %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB 已过时,现试图进行å‡çº§ %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开 DB 文件 %s:%s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "文件 %s 的时间已被改动"
+msgid "Failed to stat %s"
+msgstr "æ— æ³•è¯»å– %s 的状æ€"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "存档没有包å«æŽ§åˆ¶å­—段"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "无法获得游标(cursor)"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读å–目录 %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法对 %s 进行统计\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "错误:处ç†æ–‡ä»¶æ—¶å‡ºé”™ "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解æžè·¯å¾„ %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "无法é历目录树"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读å–符å·é“¾æŽ¥ %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "无法 unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink çš„ä¸Šé™ %sB。\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "æ— æ³•è¯»å– %s 的状æ€"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "存档没有包å«è½¯ä»¶åŒ…(package)字段"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s å¹¶éž %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s 中没有 override 项\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s 中没有 override 项\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -614,257 +637,255 @@ msgstr "在 unlink %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s é‡å‘½å为 %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达å¼æ—¶å‡ºé”™ - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有ä¸èƒ½æ»¡è¶³çš„ä¾èµ–关系:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "但是 %s å·²ç»å®‰è£…了"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s æ­£è¦è¢«å®‰è£…"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "但å´æ— æ³•å®‰è£…它"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "但是它åªæ˜¯ä¸ªè™šæ‹Ÿè½¯ä»¶åŒ…"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "但是它将ä¸ä¼šè¢«å®‰è£…"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "下列ã€æ–°ã€‘软件包将被安装:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被ã€å¸è½½ã€‘:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将ä¿æŒä¸å˜ï¼š"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被å‡çº§ï¼š"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被ã€é™çº§ã€‘:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "下列被è¦æ±‚ä¿æŒç‰ˆæœ¬ä¸å˜çš„软件包将被改å˜ï¼š"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ã€è­¦å‘Šã€‘:下列的é‡è¦è½¯ä»¶åŒ…将被å¸è½½ \n"
-"请勿å°è¯•ï¼Œé™¤éžæ‚¨ç¡®å®žæ¸…楚您正在执行的æ“作ï¼"
+"请勿å°è¯•ï¼Œé™¤éžæ‚¨ç¡®å®žçŸ¥é“您在åšä»€ä¹ˆï¼"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "å…±å‡çº§äº† %lu 个软件包,新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "å…±é‡æ–°å®‰è£…了 %lu 个软件包,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "é™çº§äº† %lu 个软件包,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "è¦å¸è½½ %lu 个软件包,有 %lu 个软件未被å‡çº§ã€‚\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或å¸è½½ã€‚\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "正在更正ä¾èµ–关系..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "无法更正ä¾èµ–关系"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
-msgstr "无法使å‡çº§çš„软件包集最å°åŒ–"
+msgstr "无法最å°åŒ–è¦å‡çº§çš„软件包集åˆ"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 完æˆ"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ­£ä¸Šé¢çš„错误。"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "ä¸èƒ½æ»¡è¶³ä¾èµ–关系。ä¸å¦¨è¯•ä¸€ä¸‹ -f 选项。"
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ã€è­¦å‘Šã€‘:下列的软件包ä¸èƒ½é€šè¿‡è®¤è¯ï¼"
+msgstr "ã€è­¦å‘Šã€‘:下列的软件包ä¸èƒ½é€šè¿‡éªŒè¯ï¼"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "忽略了认è¯è­¦å‘Šã€‚\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "ä¸ç»éªŒè¯å°±å®‰è£…这些软件包么?[y/N] "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "有些软件包ä¸èƒ½é€šè¿‡éªŒè¯"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes。"
+msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上ï¼"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需è¦è¢«å¸è½½ï¼Œä½†æ˜¯å¸è½½åŠ¨ä½œè¢«ç¨‹åºè®¾ç½®æ‰€ç¦æ­¢ã€‚"
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:776
msgid "Internal error, Ordering didn't finish"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "内部错误,Ordering 没有完æˆ"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加é”"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读å–安装æºåˆ—表。"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "怪了……文件大å°ä¸ç¬¦ï¼Œå‘ä¿¡ç»™ apt@packages.debian.org å§"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需è¦ä¸‹è½½ %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需è¦ä¸‹è½½ %sB 的软件包。\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解压缩åŽä¼šæ¶ˆè€—掉 %sB çš„é¢å¤–空间。\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩åŽå°†ä¼šç©ºå‡º %sB 的空间。\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only,但这ä¸æ˜¯ä¸ªæ—¥å¸¸(trivial)æ“作。"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:869
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"您的æ“作会导致潜在的å±å®³\n"
+"您的æ“作会导致潜在的å±å®³ã€‚\n"
"若还想继续的è¯ï¼Œå°±è¾“入下é¢çš„短å¥â€œ%sâ€\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行å—?[Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "下载完毕,目å‰æ˜¯â€œä»…下载â€æ¨¡å¼"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -872,47 +893,47 @@ msgstr ""
"有几个软件包无法下载,您å¯ä»¥è¿è¡Œ apt-get update 或者加上 --fix-missing 的选项"
"å†è¯•è¯•ï¼Ÿ"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "ç›®å‰è¿˜ä¸æ”¯æŒ --fix-missing 和介质交æ¢(media swapping)"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注æ„,我选了 %s è€Œéž %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已ç»è¢«å®‰è£…而且没有指定è¦å‡çº§ã€‚\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而ä¸ä¼šè¢«å¸è½½\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下é¢çš„软件包æ供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个æ¥è¿›è¡Œå®‰è£…。"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -923,74 +944,93 @@ msgstr ""
"è¿™å¯èƒ½æ„味ç€è¿™ä¸ªç¼ºå¤±çš„软件包å¯èƒ½å·²è¢«åºŸå¼ƒï¼Œ\n"
"或者åªèƒ½åœ¨å…¶ä»–å‘布æºä¸­æ‰¾åˆ°\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "å¯æ˜¯ä¸‹åˆ—的软件包å–代了它:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有å¯ä¾›å®‰è£…的候选者"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ä¸èƒ½é‡æ–°å®‰è£… %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s å·²ç»æ˜¯æœ€æ–°çš„版本了。\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$sâ€çš„“%1$sâ€å‘布版本"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$sâ€çš„“%1$sâ€ç‰ˆæœ¬"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr " update 命令是ä¸éœ€ä»»ä½•å‚æ•°çš„"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "无法对状æ€åˆ—表目录加é”"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件ä¸èƒ½ä¸‹è½½ï¼Œå®ƒä»¬å¯èƒ½è¢«å¿½ç•¥äº†ï¼Œä¹Ÿå¯èƒ½è½¬è€Œä½¿ç”¨äº†æ—§çš„索引文件。"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "下列的信æ¯å¯èƒ½ä¼šå¯¹è§£å†³é—®é¢˜æœ‰æ‰€å¸®åŠ©ï¼š"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误,problem resolver å事了"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误,AllUpgrade 造æˆæŸäº›æ•…éšœ"
+msgstr "内部错误,AllUpgrade å事了"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注æ„,根æ®æ­£åˆ™è¡¨è¾¾å¼â€œ%2$sâ€é€‰ä¸­äº† %1$s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您å¯èƒ½éœ€è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ­£ä¸‹åˆ—错误:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -998,7 +1038,7 @@ msgstr ""
"有未能满足的ä¾èµ–关系。请å°è¯•ä¸æŒ‡æ˜Žè½¯ä»¶åŒ…çš„åå­—æ¥è¿è¡Œâ€œapt-get -f installâ€(也å¯"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1009,7 +1049,7 @@ msgstr ""
"因为系统无法达到您è¦æ±‚的状æ€é€ æˆçš„。该版本中å¯èƒ½ä¼šæœ‰ä¸€äº›æ‚¨éœ€è¦çš„软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1018,122 +1058,122 @@ msgstr ""
"您仅è¦æ±‚对å•ä¸€è½¯ä»¶åŒ…进行æ“作,这æžæœ‰å¯èƒ½æ˜¯å› ä¸ºè¯¥è½¯ä»¶åŒ…安装ä¸ä¸Šï¼ŒåŒæ—¶ï¼Œ\n"
"您最好æ交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "下列的信æ¯å¯èƒ½ä¼šå¯¹é—®é¢˜çš„解决有所帮助:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
-msgstr "å—æŸå®‰è£…包"
+msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
-msgstr "将会安装下列的é¢å¤–的软件包:"
+msgstr "将会安装下列é¢å¤–的软件包:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "推è安装的软件包:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "正在筹划å‡çº§... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "完æˆ"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误,AllUpgrade 造æˆæŸäº›æ•…éšœ"
+msgstr "内部错误,problem resolver å事了"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "è¦ä¸‹è½½æºä»£ç ï¼Œå¿…须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的æºä»£ç åŒ…"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载过的文件“%sâ€\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需è¦ä¸‹è½½ %sB/%sB çš„æºä»£ç åŒ…。\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需è¦ä¸‹è½½ %sB çš„æºä»£ç åŒ…。\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "下载æºä»£ç  %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已ç»è¢«è§£åŒ…到 %s 目录的æºä»£ç åŒ…å°±ä¸å†è§£å¼€äº†\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "è¿è¡Œè§£åŒ…的命令“%sâ€å‡ºé”™ã€‚\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "请检查是å¦å®‰è£…了“dpkg-devâ€è½¯ä»¶åŒ…。\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%sâ€å¤±è´¥ã€‚\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "å­è¿›ç¨‹å‡ºé”™"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "è¦æ£€æŸ¥ç”Ÿæˆè½¯ä»¶åŒ…的构建ä¾èµ–关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建ä¾èµ–关系(build-dependency)ä¿¡æ¯"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建ä¾èµ–关系信æ¯ã€‚\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1142,30 +1182,30 @@ msgstr ""
"由于无法找到符åˆè¦æ±‚的软件包 %3$s çš„å¯ç”¨ç‰ˆæœ¬ï¼Œå› æ­¤ä¸èƒ½æ»¡è¶³ %2$s 所è¦æ±‚çš„ %1"
"$s ä¾èµ–关系"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所è¦æ±‚ %1$s ä¾èµ–关系:%3$s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ä¸èƒ½æ»¡è¶³è½¯ä»¶åŒ… %s 所è¦æ±‚的构建ä¾èµ–关系。"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "无法处ç†æž„建ä¾èµ–关系"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "被支æŒæ¨¡å—:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1342,19 +1382,19 @@ msgstr "正在åˆå¹¶çŽ°æœ‰ä¿¡æ¯"
msgid "Failed to create pipes"
msgstr "无法创建管é“"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "包文件已被æŸå"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "tar 的校验ç ä¸ç¬¦ï¼ŒåŒ…文件已被æŸå"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR æ•°æ®å¤´ç±»åž‹ %u,æˆå‘˜ %s"
@@ -1411,11 +1451,11 @@ msgid "Duplicate conf file %s/%s"
msgstr "é‡å¤çš„é…置文件 %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
@@ -1468,7 +1508,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的åŒå文件"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "æ— æ³•è¯»å– %s"
@@ -1498,9 +1539,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info å’Œ temp 目录è¦æ±‚处于åŒä¸€æ–‡ä»¶ç³»ç»Ÿä¹‹ä¸‹"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "正在读å–软件包列表"
@@ -1514,7 +1555,7 @@ msgstr "无法切æ¢å·¥ä½œç›®å½•åˆ° admin 目录 %sinfo"
msgid "Internal error getting a package name"
msgstr "在获å–软件包å字时出现内部错误"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "正在读å–文件列表"
@@ -1560,10 +1601,6 @@ msgstr "添加 diversion 时出现内部错误"
msgid "The pkg cache must be initialized first"
msgstr "必须首先åˆå§‹åŒ–软件包缓存"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "正在读å–文件列表"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1626,23 +1663,22 @@ msgstr "错误的光盘"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "无法å¸è½½çŽ°åœ¨æŒ‚载于 %s çš„ CD-ROM,å¯èƒ½å®ƒæ­£åœ¨ä½¿ç”¨ä¸­ã€‚"
+msgstr "无法å¸è½½çŽ°åœ¨æŒ‚载于 %s çš„ CD-ROM,它å¯èƒ½æ­£åœ¨ä½¿ç”¨ä¸­ã€‚"
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "无法找到该文件"
+msgstr "找ä¸åˆ°å…‰ç›˜ã€‚"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "无法读å–状æ€"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1769,7 +1805,7 @@ msgstr "æ•°æ®å¥—接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接å—连接"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1792,7 +1828,7 @@ msgstr "æ•°æ®ä¼ é€å‡ºé”™ï¼ŒæœåŠ¡å™¨å“应é““%sâ€"
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1821,75 +1857,74 @@ msgstr "无法å‘起与 %s:%s (%s) 的连接"
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s),连接超时"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解æžåŸŸå“%sâ€"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "æš‚æ—¶ä¸èƒ½è§£æžåŸŸå“%sâ€"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "解æžâ€œ%s:%sâ€æ—¶ï¼Œå‡ºçŽ°äº†æŸäº›æ•…éšœ (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "ä¸èƒ½è¿žæŽ¥ä¸Š %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "无法解æžåŸŸå“%sâ€"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "错误:Acquire::gpgv::Options çš„å‚数列表超长。结æŸè¿è¡Œã€‚"
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部错误:签å正确无误,但是无法确认密钥的指纹(key fingerprint)?ï¼"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "至少å‘现一个无效的签å。"
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "æ— æ³•èŽ·å¾—é” %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:213
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "用于验è¯ç­¾å(您安装了 gnupg 么?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "è¿è¡Œ gpgv æ—¶å‘生未知错误"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "将会安装下列的é¢å¤–的软件包:"
+msgstr "下列签å无效:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+msgstr "由于没有公钥,下列签å无法进行验è¯ï¼š\n"
#: methods/gzip.cc:57
#, c-format
@@ -1901,76 +1936,76 @@ msgstr "无法为 %s å¼€å¯ç®¡é“"
msgid "Read error from %s process"
msgstr "从 %s 进程读å–æ•°æ®å‡ºé”™"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "å—到了一行报头æ¡ç›®ï¼Œå®ƒçš„长度超过了 %u 个字符"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "错误的报头æ¡ç›®"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„应答报头"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Length 报头"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Range 报头"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "该 http æœåŠ¡å™¨çš„ range 支æŒä¸æ­£å¸¸"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "无法识别的日期格å¼"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "连接æœåŠ¡å™¨è¶…æ—¶"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®æ—¶å‡ºé”™ï¼Œå¯¹æ–¹å…³é—­äº†è¿žæŽ¥"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®å‡ºé”™"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "错误的报头数æ®"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "内部错误"
@@ -1983,7 +2018,7 @@ msgstr "无法 mmap 一个空文件"
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数æ®"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "没有å‘现您的所选 %s"
@@ -2104,7 +2139,7 @@ msgstr "无效的æ“作 %s"
msgid "Unable to stat the mount point %s"
msgstr "无法读å–文件系统挂载点 %s 的状æ€"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "无法切æ¢å·¥ä½œç›®å½•åˆ° %s"
@@ -2249,74 +2284,89 @@ msgstr "å¯é€‰"
msgid "extra"
msgstr "é¢å¤–"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "正在分æžè½¯ä»¶åŒ…çš„ä¾èµ–关系树"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "生æˆä¾èµ–关系"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "正在åˆå¹¶çŽ°æœ‰ä¿¡æ¯"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开 %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入文件 %s"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行的格å¼æœ‰è¯¯ (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (Ablolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包æ¥æºæ¡£ %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在安装æºåˆ—表 %3$s 里,第 %2$u 行中的软件包类别“%1$sâ€"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (vendor id)"
@@ -2337,13 +2387,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "ä¸æ”¯æŒç´¢å¼•æ–‡ä»¶ç±»åž‹â€œ%sâ€"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需è¦é‡æ–°å®‰è£…,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2351,7 +2401,7 @@ msgstr ""
"错误,pkgProblemResolver::Resolve å‘生故障,这å¯èƒ½æ˜¯æœ‰è½¯ä»¶åŒ…被è¦æ±‚ä¿æŒçŽ°çŠ¶çš„"
"缘故。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您è¦æ±‚æŸäº›è½¯ä»¶åŒ…ä¿æŒçŽ°çŠ¶ï¼Œå°±æ˜¯å®ƒä»¬ç ´å了软件包间的ä¾èµ–å…³"
@@ -2367,10 +2417,17 @@ msgstr "软件包列表的目录 %spartial ä¸è§äº†ã€‚"
msgid "Archive directory %spartial is missing."
msgstr "找ä¸åˆ°â€œ%spartialâ€è¿™ä¸ªç›®å½•ã€‚"
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件(共 %li 个,尚需 %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在读å–文件列表"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2382,20 +2439,17 @@ msgstr "无法找到获å–è½¯ä»¶åŒ…çš„æ¸ é“ %s 所需的驱动程åºã€‚"
msgid "Method %s did not start correctly"
msgstr "获å–è½¯ä»¶åŒ…çš„æ¸ é“ %s 所需的驱动程åºæ²¡æœ‰æ­£å¸¸å¯åŠ¨ã€‚"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:384
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"æ›´æ¢ä»‹è´¨ï¼šè¯·æŠŠæ ‡æœ‰\n"
-"“%sâ€\n"
-"的碟片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®\n"
+msgstr "请把标有 “%s†的碟片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®ã€‚"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ä¸æ”¯æŒâ€œ%sâ€æ‰“包系统"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适åˆçš„打包系统类型"
@@ -2406,7 +2460,7 @@ msgstr "æ— æ³•è¯»å– %s 的状æ€ã€‚"
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 输入一些“软件包æºâ€çš„ URL"
+msgstr "您必须在您的 sources.list 写入一些“软件包æºâ€çš„ URI"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2429,82 +2483,82 @@ msgstr "无法识别é”定的类型(pin type) %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本é”定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是ä¸å…¼å®¹çš„版本控制系统"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "å¤„ç† %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "å¤„ç† %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "å¤„ç† %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "å¤„ç† %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "å¤„ç† %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "å¤„ç† %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "å¤„ç† %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了,软件包的数é‡äº†è¶…出本程åºçš„处ç†èƒ½åŠ›ã€‚"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了,软件包版本的数é‡äº†è¶…出本程åºçš„处ç†èƒ½åŠ›ã€‚"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了,ä¾èµ–关系的数é‡è¶…出了本程åºçš„处ç†èƒ½åŠ›ã€‚"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "å¤„ç† %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "å¤„ç† %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处ç†æ–‡ä»¶ä¾èµ–关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获å–æºè½¯ä»¶åŒ…列表 %s 的状æ€"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "正在收集文件所æ供的软件包"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "无法写入æ¥æºç¼“存文件"
@@ -2513,11 +2567,15 @@ msgstr "无法写入æ¥æºç¼“存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法é‡å‘½å文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5 校验和ä¸ç¬¦"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有å¯ç”¨çš„公钥:\n"
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2526,7 +2584,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这ç§æƒ…况下å¯èƒ½éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2534,13 +2592,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这ç§æƒ…况下您å¯èƒ½éœ€è¦æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶åŒ…。"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已æŸå。找ä¸åˆ°å¯¹åº”软件包 %s çš„ Filename: 字段"
+msgstr "软件包的索引文件已æŸå。找ä¸åˆ°å¯¹åº”软件包 %s çš„ Filename: 字段。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "大å°ä¸ç¬¦"
@@ -2644,59 +2702,74 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i ä¸ªç¼ºå¤±ï¼Œä»¥åŠ %i 个文件ä¸å»åˆ\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "正在打开 %s"
+msgstr "正在准备 %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "正在打开 %s"
+msgstr "正在解压缩 %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "正在打开é…置文件 %s"
+msgstr "正在准备é…ç½® %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "正在连接 %s"
+msgstr "正在é…ç½® %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " 已安装:"
+msgstr "已安装 %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "正在准备 %s 的删除æ“作"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "正在打开 %s"
+msgstr "正在删除 %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "推è"
+msgstr "已删除 %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备é…ç½® %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "无法删除 %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "File date has changed %s"
+#~ msgstr "文件 %s 的时间已被改动"
+
+#~ msgid "Reading file list"
+#~ msgstr "正在读å–文件列表"
+
+#~ msgid "Could not execute "
+#~ msgstr "未能执行 "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "正在准备连åŒé…置文件的删除 %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "è¿žåŒé…置文件一åŒåˆ é™¤ %s "
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "在安装æºåˆ—表 %3$s 的第 %2$u è¡Œå‘现了无法识别的软件æ供商 ID (vendor ID) “%"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9f4657ca..ffa84044c 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: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-08-09 23:46+0200\n"
"PO-Revision-Date: 2005-02-19 22:24+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -147,14 +147,14 @@ msgstr " 版本表格:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s 是é‡å°æ–¼ %s %s 並編譯在 %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -228,6 +228,22 @@ msgstr ""
" -o=? 設定任æ„指定的設定é¸é …,例如 -o dir::cache=/tmp\n"
"è‹¥è¦æ·±å…¥äº†è§£,您還å¯ä»¥æŸ¥é–± apt-cache(8) å’Œ apt.conf(5) åƒè€ƒæ‰‹å†Šã€‚\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"æ›´æ›åª’é«”:請把å為\n"
+" '%s' 的光碟\n"
+"æ’å…¥ '%s' 碟機,然後按 [Enter] éµã€‚\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "åƒæ•¸ä¸¦éžä¸€å°"
@@ -289,7 +305,7 @@ msgstr ""
" -c=? 讀å–指定的設定檔案\n"
" -o=? 設定任æ„指定的設定é¸é …,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入『%sã€ã€‚"
@@ -412,115 +428,126 @@ msgstr "找ä¸åˆ°ç¬¦åˆçš„é¸é …"
msgid "Some files are missing in the package file group `%s'"
msgstr "套件檔案組 `%s' 缺少部份檔案"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB å·²æ毀,檔案被更åæˆ %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB éŽèˆŠ,嘗試更新 %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "無法開啟 DB 檔案 %s:%s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "檔案資料已更改 %s"
+msgid "Failed to stat %s"
+msgstr "無法å–å¾— %s 的狀態"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "檔案沒有 control 記錄"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "無法å–得游標"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W:無法讀å–目錄 %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W:無法å–å¾— %s 狀態\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "錯誤:"
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E:套用到檔案時出錯"
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "無法解æžè·¯å¾‘ %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "無法走訪目錄樹"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "無法開啟 %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " ç§»é™¤é€£çµ %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "無法讀å–符號éˆæŽ¥ %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "無法 unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 無法將 %s éˆæŽ¥åˆ° %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " é”到了 DeLink çš„ä¸Šé™ %sB。\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "無法å–å¾— %s 的狀態"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "檔案無套件字符"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ç„¡ override é …ç›®\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 套件維護者是 %s éž %s\n"
+#: ftparchive/writer.cc:623
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s ç„¡ override é …ç›®\n"
+
+#: ftparchive/writer.cc:627
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s ç„¡ override é …ç›®\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -616,79 +643,79 @@ msgstr "在 unlink %s 時出錯"
msgid "Failed to rename %s to %s"
msgstr "無法將 %s æ›´å為 %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正è¦è¡¨ç¤ºæ³•å‡ºéŒ¯ - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "下列的套件有無法滿足的ä¾å­˜é—œä¿‚:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "但是『%sã€å»å·²ç¶“安è£å¥½äº†ã€‚"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "但是『%sã€å»å°‡è¢«å®‰è£ã€‚"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "但是它å»ç„¡æ³•å®‰è£ã€‚"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "但是它åªæ˜¯è™›æ“¬çš„套件"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr "但是『%sã€å»é‚„沒有安è£ã€‚"
+msgstr "但是『ã€å»é‚„沒有安è£ã€‚"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "但是它å»ä¸æœƒè¢«å®‰è£ã€‚"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr "或"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "下列的ã€æ–°ã€‘套件都將被安è£ï¼š"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "下列的套件都將被ã€åˆªé™¤ã€‘:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "下列的套件都將維æŒèˆŠç‰ˆæœ¬:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "下列的套件都將更新:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "下列的套件都將被「é™ç´šã€:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "下列押後的套件都將被更改:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s(因為 %s)"
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -697,144 +724,144 @@ msgstr ""
"警告:下列的é‡è¦å¥—件都將被刪除\n"
"除éžæ‚¨å¾ˆæ¸…楚在åšä»€éº¼ï¼Œè«‹å‹¿è¼•æ˜“嘗試。"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "æ›´æ–° %lu å€‹å¥—ä»¶ï¼Œæ–°å®‰è£ %lu 個套件,"
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "é‡æ–°å®‰è£ %lu 個套件,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "é™ %lu 個套件的版,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "刪除 %lu 個套件,å¦ä¸æ›´æ–° %lu 個套件。\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個套件沒有完全安è£æˆ–刪除完畢。\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:650
msgid "Correcting dependencies..."
msgstr "æ›´æ­£ä¾å­˜é—œä¿‚中..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:653
msgid " failed."
msgstr "失敗"
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:656
msgid "Unable to correct dependencies"
msgstr "無法更正ä¾å­˜é—œä¿‚。"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:659
msgid "Unable to minimize the upgrade set"
msgstr "無法最å°åŒ–å‡ç´šçš„套件集åˆ"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:661
msgid " Done"
msgstr " 完æˆ"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "用『apt-get -f installã€æŒ‡ä»¤æˆ–許能修正這些å•é¡Œã€‚"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:668
msgid "Unmet dependencies. Try using -f."
msgstr "無法滿足相ä¾é—œä¿‚。試試看 -f é¸é …。"
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:690
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "警告:下列的套件驗證失敗ï¼"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:694
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:701
msgid "Install these packages without verification [y/N]? "
msgstr "ä¸é©—證這些套件就直接安è£ï¼Ÿ[y/N]"
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:703
msgid "Some packages could not be authenticated"
msgstr "部份套件無法驗證"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
msgid "There are problems and -y was used without --force-yes"
msgstr "出ç¾ä¸€äº›å•é¡Œ,您使用了 -y é¸é …但是沒有用 --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:756
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:765
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需è¦è¢«ç§»é™¤,但移除動作被ç¦æ­¢ã€‚"
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤:新增轉移(diversion)失敗"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "無法讀å–來æºå–®ã€‚"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:817
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需è¦ä¸‹è¼‰ %2$sB 中 %1$sB 的檔案。\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:825
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需è¦ä¸‹è¼‰ %sB 的檔案。\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解壓縮後將消耗 %sB 的空間。\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:833
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解壓縮後將空出 %sB 的空間。\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "『%sã€å…§æ²’有足夠的空間。"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, c-format
msgid "You don't have enough free space in %s."
msgstr "『%sã€å…§æ²’有足夠的空間。"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "雖然您指定了 Trivial Only,但這ä¸æ˜¯å€‹é¡¯è€Œæ˜“懂的(trivial)æ“作。"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:867
msgid "Yes, do as I say!"
msgstr "是的,請執行我所指定的"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:869
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -845,28 +872,28 @@ msgstr ""
"è‹¥è¦ç¹¼çºŒçš„話,就輸入下é¢çš„å¥å­â€œ%sâ€\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
msgid "Abort."
msgstr "放棄執行。"
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:890
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎? 是按 [Y] éµï¼Œå¦æŒ‰ [n] éµ "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%sã€æª”案。%s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "下載完畢,ç›®å‰æ˜¯â€œåƒ…下載â€æ¨¡å¼"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:987
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -874,47 +901,47 @@ msgstr ""
"有幾個檔案無法下載,您å¯ä»¥åŸ·è¡Œ apt-get update 或者嘗試加上--fix-missing \n"
"é¸é …?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:991
msgid "--fix-missing and media swapping is not currently supported"
msgstr "ç›®å‰é‚„ä¸æ”¯æ´ --fix-missing 和媒體置æ›(media swapping)"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
msgid "Unable to correct missing packages."
msgstr "無法更正éºå¤±çš„套件。"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:997
msgid "Aborting install."
msgstr "放棄安è£ã€‚"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1031
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注æ„,é¸æ“‡äº† %s è€Œéž %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1041
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略 %s,它已經被安è£è€Œä¸”沒有指定è¦å‡ç´šã€‚\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1059
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "套件『%sã€æ²’有安è£ï¼Œæ‰€ä»¥ç„¡æ³•åˆªé™¤ã€‚\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1070
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "虛擬套件『%sã€çš„æ供者是:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1082
msgid " [Installed]"
msgstr "ã€å·²å®‰è£ã€‘"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1087
msgid "You should explicitly select one to install."
msgstr "請您明確地é¸æ“‡ä¸€å€‹ä¾†é€²è¡Œå®‰è£ã€‚"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1092
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -925,73 +952,92 @@ msgstr ""
"這å¯èƒ½æ„味著這個套件已經消失或æ¨æ£„,\n"
"或者åªèƒ½åœ¨å…¶ä»–原碼中找到\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1111
msgid "However the following packages replace it:"
msgstr "但是下列的套件將å–代它:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1114
#, c-format
msgid "Package %s has no installation candidate"
msgstr "套件 %s 還沒有å¯ä¾›å®‰è£çš„候é¸ç‰ˆæœ¬"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1134
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ä¸èƒ½é‡æ–°å®‰è£ %s,因為無法下載它。\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1142
#, c-format
msgid "%s is already the newest version.\n"
msgstr "『%sã€å·²ç¶“是最新版本了。\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1171
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$sâ€çš„“%1$sâ€ç™¼å¸ƒç‰ˆæœ¬"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1173
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$sâ€çš„“%1$sâ€ç‰ˆæœ¬"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1179
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "é¸å®šçš„版本為 %s (%s) çš„ %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1316
msgid "The update command takes no arguments"
msgstr "update 指令ä¸éœ€ä»»ä½•åƒæ•¸"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1329
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr "有一些索引檔案ä¸èƒ½ä¸‹è¼‰,它們å¯èƒ½è¢«å¿½ç•¥äº†,也å¯èƒ½è½‰è€Œä½¿ç”¨äº†èˆŠçš„索引檔案。"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1412
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1437
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+msgid "The following information may help to resolve the situation:"
+msgstr "底下的資訊有助於解決ç¾åœ¨çš„情æ³:"
+
+#: cmdline/apt-get.cc:1444
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "內部錯誤,AllUpgrade 造æˆéŒ¯èª¤"
+
+#: cmdline/apt-get.cc:1463
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造æˆéŒ¯èª¤"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1584
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注æ„,根據正è¦è¡¨ç¤ºæ³•â€œ%2$sâ€é¸æ“‡äº† %1$s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1614
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f installã€æŒ‡ä»¤æˆ–許能修正這些å•é¡Œã€‚"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1617
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -999,7 +1045,7 @@ msgstr ""
"無法滿足的相ä¾é—œä¿‚。請嘗試ä¸æŒ‡å®šå¥—件明æˆä¾†åŸ·è¡Œâ€œapt-get -f installâ€(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1629
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1010,7 +1056,7 @@ msgstr ""
"或是您使用ä¸ç©©å®š(unstable)發行版而這些需è¦çš„套件尚未完æˆ\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1637
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1020,122 +1066,123 @@ msgstr ""
"該套件無法安è£,您最好æ交一個é‡å°é€™å€‹å¥—件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "底下的資訊有助於解決ç¾åœ¨çš„情æ³:"
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1645
msgid "Broken packages"
msgstr "æ毀的套件"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1676
msgid "The following extra packages will be installed:"
msgstr "下列的ã€æ–°ã€‘套件都將被安è£ï¼š"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1765
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1766
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1786
msgid "Calculating upgrade... "
msgstr "籌畫å‡ç´šå¥—件中..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1794
msgid "Done"
msgstr "完æˆ"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,AllUpgrade 造æˆéŒ¯èª¤"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1969
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個å°æ‡‰çš„套件æ‰èƒ½ä¸‹è¼‰æºç¢¼"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的æºç¢¼"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2043
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "ç•¥éŽå·²ç¶“被解開到 %s 目錄的æºç¢¼æª”案\n"
+
+#: cmdline/apt-get.cc:2067
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%sã€å…§æ²’有足夠的空間。"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2072
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需è¦ä¸‹è¼‰ %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2075
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需è¦ä¸‹è¼‰ %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2081
#, c-format
msgid "Fetch source %s\n"
msgstr "下載æºç¢¼ %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2112
msgid "Failed to fetch some archives."
msgstr "無法下載æŸäº›æª”案。"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2140
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ç•¥éŽå·²ç¶“被解開到 %s 目錄的æºç¢¼æª”案\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2170
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2189
msgid "Child process failed"
msgstr "å­ç¨‹åºå¤±æ•—"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件æ‰èƒ½æª¢æŸ¥å…¶å»ºç«‹ç›¸ä¾é—œä¿‚(builddeps)"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法å–å¾— %s 的建構相ä¾é—œä¿‚。"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2253
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相ä¾é—œä¿‚訊æ¯ã€‚\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2305
#, 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:2220
+#: cmdline/apt-get.cc:2357
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1144,30 +1191,30 @@ msgstr ""
"由於無法找到符åˆè¦æ±‚的套件 %3$s çš„å¯ç”¨ç‰ˆæœ¬,å› æ­¤ä¸èƒ½æ»¿è¶³ %2$s 所è¦æ±‚çš„ %1$s çš„"
"相ä¾é—œä¿‚"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2392
#, 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:2280
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所è¦æ±‚ %1$s 相ä¾é—œä¿‚:%3$s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所è¦æ±‚的建構相ä¾é—œä¿‚。"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2435
msgid "Failed to process build dependencies"
msgstr "無法處ç†å»ºæ§‹ç›¸ä¾é—œä¿‚"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2467
msgid "Supported modules:"
msgstr "支æ´æ¨¡çµ„:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2508
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1346,19 +1393,19 @@ msgstr "çµåˆç¾æœ‰è³‡æ–™ä¸­"
msgid "Failed to create pipes"
msgstr "無法建立管線"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "無法執行 gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "æ毀的檔案"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar checksum 失敗,檔案已æ毀"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 標頭型別 %u, member è¨Šæ¯ %s"
@@ -1419,7 +1466,7 @@ msgstr "é‡è¤‡çš„設定檔 %s/%s"
msgid "Failed to write file %s"
msgstr "寫入檔案 %s 失敗"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "關閉檔案 %s 失敗"
@@ -1472,7 +1519,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "檔案 %s/%s 複寫套件 %s 中的相åŒæª”案"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "無法讀å–『%sã€ã€‚"
@@ -1502,9 +1550,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "資料目錄與暫存目錄需在åŒä¸€æª”案系統"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
+#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
+#: apt-pkg/pkgcachegen.cc:844
msgid "Reading package lists"
msgstr "讀å–套件清單中"
@@ -1518,7 +1566,7 @@ msgstr "ç„¡æ³•è®Šæ› admin 目錄至 %sinfo"
msgid "Internal error getting a package name"
msgstr "內部錯誤,無法å–得套件å稱"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "讀å–軟件表中"
@@ -1564,10 +1612,6 @@ msgstr "內部錯誤:新增轉移(diversion)失敗"
msgid "The pkg cache must be initialized first"
msgstr "套件快å–必須先åˆå§‹åŒ–"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "讀å–軟件表中"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1641,12 +1685,12 @@ msgstr "找ä¸åˆ°æª”案"
msgid "File not found"
msgstr "找ä¸åˆ°æª”案"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "無法讀å–資料"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "日期更新失敗"
@@ -1772,7 +1816,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法å…許連線"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "å•é¡Œé›œæ¹Šè¡¨"
@@ -1795,7 +1839,7 @@ msgstr "資料傳輸失敗,伺æœå™¨å›žæ‡‰ %s"
msgid "Query"
msgstr "查詢"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "ç„¡æ³•è®€å– "
@@ -1824,71 +1868,71 @@ msgstr "無法è¯çµ¡åˆ°ä¸»æ©Ÿã€Ž%s:%s (%s)ã€ã€‚"
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "無法è¯çµ¡åˆ°ä¸»æ©Ÿã€Ž%s:%s (%s)ã€ã€‚"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "無法è¯çµ¡åˆ°ä¸»æ©Ÿã€Ž%s:%s (%s)ã€ã€‚"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "è¯çµ¡ä¸»æ©Ÿã€Ž%sã€ä¸­"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "無法解æžä½ç½® %s"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "解æžã€Ž%sã€æš«æ™‚失敗"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "無法解æžã€Ž%s:%s (%i)ã€ã€‚"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "無法è¯çµ¡åˆ°ä¸»æ©Ÿã€Ž%s %sã€ï¼š"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "無法解æžä½ç½® %s"
+
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr ""
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "無法å–得『%sã€éŽ–。"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "下列的ã€æ–°ã€‘套件都將被安è£ï¼š"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1904,76 +1948,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀å–錯誤"
-#: methods/http.cc:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "å–å¾—ä¸€å€‹å–®è¡Œè¶…éŽ %u 字元的標頭"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„回覆標頭"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„ Content-Length 標頭"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„ Content-Range 標頭"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http 伺æœå™¨æœ‰æ毀的範åœæ”¯æ´"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "未知的資料格å¼"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "從é ç«¯ä¸»æ©Ÿè®€å–錯誤,關閉連線"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "從伺æœå™¨è®€å–發生錯誤"
-#: methods/http.cc:1069
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1086
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1177
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "內部錯誤"
@@ -1986,7 +2030,7 @@ msgstr "ä¸èƒ½å°‡ç©ºç™½æª”案讀入記憶體"
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法讀入檔案 %lu ä½å…ƒçµ„至記憶體"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "é¸é …『%sã€æ‰¾ä¸åˆ°ã€‚"
@@ -2107,7 +2151,7 @@ msgstr "無效的æ“作:%s"
msgid "Unable to stat the mount point %s"
msgstr "無法讀å–掛載點 %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "無法進入『%sã€ç›®éŒ„。"
@@ -2252,74 +2296,89 @@ msgstr "次è¦"
msgid "extra"
msgstr "添加"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
msgid "Building dependency tree"
msgstr "了解套件ä¾å­˜é—œä¿‚中"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:102
msgid "Candidate versions"
msgstr "候é¸ç‰ˆæœ¬"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:131
msgid "Dependency generation"
msgstr "產生套件ä¾å­˜é—œä¿‚"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#, fuzzy
+msgid "Reading state information"
+msgstr "çµåˆç¾æœ‰è³‡æ–™ä¸­"
+
+#: apt-pkg/depcache.cc:199
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 %s"
+
+#: apt-pkg/depcache.cc:205
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "寫入檔案 %s 失敗"
+
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "無法辨識套件『%sã€(1)。"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件『%sã€(1)。"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (通用資æºè­˜åˆ¥è™Ÿ)。"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (版本)。"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (通用資æºè­˜åˆ¥è™Ÿåˆ†è¾¨)。"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (特定版本)。"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (版本分辨)。"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "開啟『%sã€ä¸­"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行有錯誤 (類別)。"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類別 %1$s 於來æºæª” %3$s 第 %2$u è¡Œ"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行有錯誤 (商家å稱)。"
@@ -2339,19 +2398,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "本軟體ä¸æ”¯æŒã€Ž%sã€åž‹çš„索引檔。"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:245
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件『%sã€éœ€è¦é‡æ–°å®‰è£ï¼Œä½†æ‰¾ä¸åˆ°è»Ÿä»¶æª”案。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1075
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr "無法解決ä¾å­˜é—œä¿‚。å¯èƒ½åŽŸå› æ˜¯æŸäº›å¥—件被押後。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1077
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法解決å•é¡Œï¼Œå› ç‚ºæŸäº›æ毀的套件被押後。"
@@ -2365,11 +2424,18 @@ msgstr "找ä¸åˆ°ã€Ž%spartialã€æ¸…單目錄。"
msgid "Archive directory %spartial is missing."
msgstr "找ä¸åˆ°ã€Ž%spartialã€æª”案目錄。"
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "讀å–軟件表中"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2380,7 +2446,7 @@ msgstr "找ä¸åˆ°å®‰è£æ–¹å¼ã€Ž%sã€çš„驅動程å¼ã€‚"
msgid "Method %s did not start correctly"
msgstr "安è£æ–¹å¼ã€Ž%sã€æ²’有正確啟動。"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2388,12 +2454,12 @@ msgstr ""
" '%s' 的光碟\n"
"æ’å…¥ '%s' 碟機,然後按 [Enter] éµã€‚\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "本軟體ä¸æ”¯æŒã€Ž%sã€åŒ…è£æ³•ã€‚"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr "無法明白系統類別。"
@@ -2427,82 +2493,82 @@ msgstr "本軟體ä¸æ”¯æŒã€Ž%sã€åž‹çš„版本釘å­ã€‚"
msgid "No priority (or zero) specified for pin"
msgstr "å°æ–¼é‡˜ä½çš„檔案無優先順åº"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "套件暫存檔使用的是ä¸ç›¸å®¹çš„版本系統。"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (NewPackage)。"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (UsePackage1)。"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:152
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (UsePackage2)。"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:156
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (NewFileVer1)。"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (NewVersion1)。"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:190
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (UsePackage3)。"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:194
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (NewVersion2)。"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:209
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "套件數é‡è¶…éŽæœ¬ç¨‹å¼çš„能力。"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:212
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "套件版本數é‡è¶…éŽæœ¬ç¨‹å¼çš„能力。"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:215
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "ä¾å­˜é—œä¿‚數é‡è¶…éŽæœ¬ç¨‹å¼çš„能力。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (FindPkg)。"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "處ç†ã€Ž%sã€æ™‚發生錯誤 (CollectFileProvides)。"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:262
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "當計算相ä¾æ€§æ™‚找ä¸åˆ°å¥—件 %s %s "
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "無法讀å–來æºæª”『%sã€çš„目錄資料。"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:662
msgid "Collecting File Provides"
msgstr "收集檔案供應"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
msgid "IO Error saving source cache"
msgstr "無法寫入來æºæš«å­˜æª”。"
@@ -2511,31 +2577,35 @@ msgstr "無法寫入來æºæš«å­˜æª”。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔å因『%sã€æ›´æ›å¤±æ•— (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼ä¸ç¬¦åˆã€‚"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:646
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:759
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找ä¸åˆ°å¥—件『%sã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:818
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找ä¸åˆ°å¥—件『%sã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:854
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%sã€ç´¢å¼•æª”æ壞—缺少『Filename:ã€æ¬„。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:941
msgid "Size mismatch"
msgstr "檔案大å°ä¸ç¬¦åˆã€‚"
@@ -2679,15 +2749,25 @@ msgid "Removed %s"
msgstr "推薦"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "開啟組態檔 %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "無法移除 %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "連線ä¸é æœŸçš„çµæŸ"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "檔案資料已更改 %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "讀å–軟件表中"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "無法å–得『%sã€éŽ–。"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index c391d8fa1..bb5ed5033 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg
Binary files differ
diff --git a/test/hash.cc b/test/hash.cc
index 5334c0331..cfdb4ea9d 100644
--- a/test/hash.cc
+++ b/test/hash.cc
@@ -1,5 +1,6 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha256.h>
#include <apt-pkg/strutl.h>
#include <iostream>
@@ -57,6 +58,12 @@ int main()
"d174ab98d277d9f5a5611c2c9f419d9f");
Test<MD5Summation>("12345678901234567890123456789012345678901234567890123456789012345678901234567890",
"57edf4a22be3c955ac49da2e2107b67a");
+
+ // SHA-256, From FIPS 180-2
+ Test<SHA256Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+ "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+
+
return 0;
}
diff --git a/test/testdeb.cc b/test/testdeb.cc
index 5986621bb..d28f20114 100644
--- a/test/testdeb.cc
+++ b/test/testdeb.cc
@@ -23,7 +23,7 @@ bool Test(const char *File)
return false;
// Extract it.
- ExtractTar Tar(Deb.GetFile(),Member->Size);
+ ExtractTar Tar(Deb.GetFile(),Member->Size, "gzip");
NullStream Dir;
if (Tar.Go(Dir) == false)
return false;
diff --git a/test/versions.lst b/test/versions.lst
index 008a0f2d7..efc19c4f0 100644
--- a/test/versions.lst
+++ b/test/versions.lst
@@ -20,6 +20,13 @@ z . -1
# Epochs
1:0.4 10.3 1
1:1.25-4 1:1.25-8 -1
+0:1.18.36 1.18.36 0
+
+# Funky, but allowed, characters in upstream version
+9:1.18.36:5.4-20 10:0.5.1-22 -1
+9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1
+9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1
+1.18.36-0.17.35-18 1.18.36-19 1
# Junk
1:1.2.13-3 1:1.2.13-3.1 -1